carlos apagou linha git
Merge branch 'master' of https://github.com/miguellosa/exerciciogitv2

Conflicts:
	estudoeapli.txt