Working on boss
Merge branch 'master' of https://github.com/cschloer/CS361-Spectrum

Conflicts:
	Spectrum/Assembly-UnityScript-vs.unityproj
	Spectrum/Assembly-UnityScript.unityproj
	Spectrum/Library/AssetServerCacheV3
	Spectrum/Library/metadata/53/532891ccfcbae48c39a49d2502347e61
	Spectrum/Spectrum.userprefs