Hadoukengit commitgit commit
Merge branch 'master' of https://github.com/prkstaff/teste_aula_git
Merge branch 'master' of https://github.com/prkstaff/teste_aula_git

Conflicts:
	funciona sim.txt
	jaspion.txt