minor things
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
	Project4_Fighter/Library/guidmapper
	Project4_Fighter/Library/metadata/25/2595e86f5433a4f42b9d3da67c57dd67
	Project4_Fighter/Library/metadata/34/34063e186dc134e489c94519953309e7
	Project4_Fighter/Library/metadata/49/4928da0076b623f4986feb1c4133b100