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

Conflicts:
	Spectrum/Library/CurrentLayout.dwlt
	Spectrum/Library/CurrentMaximizeLayout.dwlt
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Spectrum/Library/assetDatabase3
	Spectrum/Library/expandedItems
	Spectrum/Library/guidmapper
	Spectrum/Library/metadata/52/527596adcbca5488189a123d0f4c9c15
	Spectrum/Library/metadata/9b/9b5f88437b980a74aba6ea12b18240da
	Spectrum/Library/metadata/f2/f2bfc4fd283904fd7a28557c951548b3
	Spectrum/ProjectSettings/EditorBuildSettings.asset