idk really… waiting for fixed core from colleen
finished all sides except doors
Merge branch 'master' of https://github.com/oconshien/cls_upper

Conflicts:
	Assets/Assembly-UnityScript-firstpass/Materials/Wood_Bamboo_Medium.mat.meta
	Assets/OpenRightDoor.prefab.meta
	Assets/open-door.prefab.meta
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper