edit - ana
Merge branch 'master' of https://github.com/1090578HugoFerreira/ex1git

Conflicts:
	estudo eapli.txt