Finishing merging conflict
Merge branch 'master' of https://github.com/tdubourg/geobombing

Conflicts:
	server/game_server.js