apagou git
Merge branch 'master' of https://github.com/losa1/exerciciogitaula

Conflicts:
	eapli.txt