Player appears in correct part of room v2
Merge remote-tracking branch 'origin/master'

Conflicts:
	sadSpace.js
Merge branch 'master' of https://github.com/PetreThePunk/AmongTheStars

Conflicts:
	sadSpace.js