got the lighting down (for now) all of the hanging lights in the hallway are in
Merge branch 'master' of https://github.com/oconshien/cls_upper

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems