server vip
Merge branch 'master' of https://github.com/slm-sandbox/akta-kurvan

Conflicts:
	server/game.coffee