Information if you are the only player
Merge branch 'master' of github.com:m3my/applicaton

Conflicts:
	app/scripts/controllers/game.js
Merge branch 'master' of github.com:m3my/applicaton

Conflicts:
	app/scripts/controllers/game.js