Modified user.php, user.php, and game.php
Merge branch 'master' of https://github.com/purmou/IntuitHack

Conflicts:
	helpers/user.php
Added catcher.php and game-view.php
Added to game.php
Updated gameView.php
Merge branch 'master' of https://github.com/purmou/IntuitHack

Conflicts:
	engine/db.php
remove db.php
Updated game and game-scene