mother fucker! :D
The game is working :D
Merge branch 'master' of https://github.com/brunoocasali/show-do-milhao

Conflicts:
	.idea/workspace.xml
	log/development.log