Moving Between rooms
Merge branch 'master' into feature2

Conflicts:
	gameObject.js
	main.js