Apagando a linha "Git"
Merge branch 'master' of http://github.com/1110829BrunoTavares/ExercicioGIT

Conflicts:
	estudoeapli.txt