working on the second scene
Merge branch 'master' of https://github.com/adamison/Transformation

Conflicts:
	Assets/Prefabs/Environment/RoundDoor2.prefab.meta