Server side objects
Merge branch 'master' of https://github.com/mafik/Ships

Conflicts:
	static/game.js