comit
Merge branch 'master' of https://github.com/1110634/tEAPLI

Conflicts:
	Testar.txt