...
Merge branch 'master' of https://github.com/Aaronneyer/EECS290_Project4

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