sem git carlos
Merge branch 'master' of https://github.com/1110158NunoSilva/ExGit

Conflicts:
	EstudoEapli.txt