lobby
Merge branch 'master' of https://github.com/dude-seriously/gimme-that-ball

Conflicts:
	css/core.css
	js/player.js