nada
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/ylhaeri/gameshunter.git
gayzao
Merge remote-tracking branch 'origin/master'

Conflicts:
	gameshunter/src/main/java/br/com/gameshunter/model/Login.java