Conflito
Merge branch 'master' of https://github.com/1110423RuiCosta/gitPL

Conflicts:
	estudo eapli.txt