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

Conflicts:
	Spectrum/Assets/Resources/Scripts/Monster.js
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Spectrum/Library/assetDatabase3