1
Merge branch 'master' of https://github.com/joshsarath/CSC-589-Prototype-3

Conflicts:
	Protoype-3/Library/ScriptAssemblies/Assembly-CSharp.dll
	Protoype-3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Protoype-3/Library/assetDatabase3