Updated Client
Merge branch 'master' of https://github.com/hoppertim/Game_Project

Conflicts:
	JS/game_engine_client.js