teste devido ao conflito
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/ylhaeri/gameshunter.git
paranaue
paranaeu