Klient uzywa vx, vy
Merge branch 'master' of https://github.com/mafik/Ships

Conflicts:
	server.js