Server tells game it's the server
some things
Merge branch 'master' of https://github.com/TacticalDan/FiestyFruits
Code refactor so unit and player inherit from gameobject
Merge branch 'master' of https://github.com/TacticalDan/FiestyFruits

Conflicts:
	app.js
	index.html