Committing collider changes to the game.
Adjusted room positions

Conflicts:
	Assets/test.unity