minor changes
Merge branch 'master' of https://github.com/kleinzach/290P4

Conflicts:
	Project4_Fighter/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project4_Fighter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project4_Fighter/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Project4_Fighter/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Project4_Fighter/Library/assetDatabase3
	Project4_Fighter/Library/guidmapper
	Project4_Fighter/Temp/__EditModeScene