Revert ac5dba2..05c6420

This rolls back to commit ac5dba23e5de75d9601c3f65a6e647cb16c8fd99.
Merge branch 'master' of https://github.com/twentyseven27/thegame

Conflicts:
	www/css/style.css
	www/js/app.js