Lighting
Merge branch 'master' of https://github.com/cschloer/CS361-Spectrum

Conflicts:
	Spectrum/Library/assetDatabase3
	Spectrum/Library/guidmapper
	Spectrum/Library/metadata/53/532891ccfcbae48c39a49d2502347e61
	Spectrum/Library/metadata/9b/9b5f88437b980a74aba6ea12b18240da