Cherry pick homework

Merged Daniel Duarte requested to merge daniel.duarte/git.practice:CherryPickHomework into develop Apr 18, 2019