cleaned up adminion.js a litle
Merge branch 'master' of https://github.com/adminion/adminion

Conflicts:
	controllers/game.js

game.js added