Test merge
Merge branch 'master' of https://github.com/leovieira/APEG.git

Conflicts:
	input/Testando_TUDO