Moved Configuration file
Merge branch 'master' of https://github.com/cschloer/CS361-Spectrum

Conflicts:
	Spectrum/Assets/Resources/Scripts/Tile.js
	Spectrum/Library/CurrentLayout.dwlt
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Spectrum/Library/assetDatabase3
	Spectrum/Library/guidmapper