Commit conflict prolly

Resolving test
Ok tudo resolvido?

Boss!
Merge branch 'master' of https://github.com/tpedrob/BookOfHeroes

Conflicts:
	zzzzzzzzzz.txt