IDK it wanted me to commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Spectrum/Assembly-UnityScript-vs.unityproj
	Spectrum/Assembly-UnityScript.unityproj
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Spectrum/Library/assetDatabase3
	Spectrum/Library/guidmapper
	Spectrum/Library/metadata/0c/0cfba7a3cb77b4fb0a4e0c693f00b1b8
	Spectrum/Library/metadata/39/39222112f35fac24ca5c336859740745
	Spectrum/Library/metadata/49/49e3294143574c54b8a0e73cc5f207ae
	Spectrum/Library/metadata/52/52ec0bdb751e54637a5fa1cb641a2f70
	Spectrum/Library/metadata/53/532891ccfcbae48c39a49d2502347e61
	Spectrum/Library/metadata/8d/8d2db7c83d86344efbd45d8f5935e4de
	Spectrum/Library/metadata/91/9144a2aee6a984e31b9a9285bb7a5348
	Spectrum/Library/metadata/9b/9b5f88437b980a74aba6ea12b18240da
	Spectrum/Library/metadata/b0/b0efe2de9162c694a9bb9df65b1d9e7c
	Spectrum/Library/metadata/d4/d4013fac6314b7c43ad1a8a4a426374d
	Spectrum/Library/metadata/f2/f2bfc4fd283904fd7a28557c951548b3
Merge branch 'master' of https://github.com/cschloer/CS361-Spectrum

Conflicts:
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Spectrum/Library/assetDatabase3
	Spectrum/Library/guidmapper
	Spectrum/Library/metadata/9b/9b5f88437b980a74aba6ea12b18240da
	Spectrum/Library/metadata/f2/f2bfc4fd283904fd7a28557c951548b3