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

Conflicts:
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll