passou a merda sem ter feito pull
Merge branch 'master' of https://github.com/miguellosa/exercv2git

Conflicts:
	estudoeapli.txt