working on left-hand side of main hallway
Merge branch 'master' of https://github.com/oconshien/cls_upper

Conflicts:
	Library/assetDatabase3