teste
teste
Merge remote-tracking branch 'origin/master'

Conflicts:
	gameshunter/src/main/java/br/com/gameshunter/DAO/UsuarioDAO.java
	gameshunter/src/test/java/br/com/gameshunter/DAO/UsuarioDAOTest.java