Changed the Transitions between rooms

Player now moves with camera during room transitions.
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameJamProject/Assets/Scene1.unity
	GameJamProject/Assets/Scripts/PlayerScript.cs