username in game not objects
merging
Merge branch 'master' of github.com:barbecuesoft/wodrs

Conflicts:
	wodrs_fe/css/style.css
	wodrs_fe/js/game.js