Timao33333
Merge branch 'master' of https://github.com/demonstrativo/laughing-archer

Conflicts:
	arquivo.txt