Completed
Merge branch 'master' of https://github.com/JuliePessoa/s1-lab1