Retirei a linha Git
Merge branch 'master' of https://github.com/HelderMPinhal/ExercicioGit

Conflicts:
	estudo eapli.txt