Merge branch 'master' of https://github.com/balstar5283/Fighter into Tan

Conflicts:
	Assembly-CSharp.pidb
	Fighter.userprefs
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
Merge with Master
Merge branch 'master' of https://github.com/balstar5283/Fighter into Tan

Conflicts:
	.gitignore
	Assembly-CSharp.pidb
	Fighter.userprefs
Added more animation frames
Merge branch 'master' of https://github.com/balstar5283/Fighter into Tan
Added metafiles
Added Damaged frame
Ignoring Library folder again
Remove Library folder
Ignore Library folder
Merge branch 'master' of https://github.com/balstar5283/Fighter into Tan

Conflicts:
	Assembly-CSharp.pidb
	Fighter.userprefs
Updated MovementAnimation.cs
Reattached timer script
Added separate material for players
Added .meta files
Merge branch 'master' of https://github.com/balstar5283/Fighter into Tan
Updated rounds and health bar
Attach movement to animation on players
Merge branch 'Nhat' of https://github.com/balstar5283/Fighter

Conflicts:
	Assembly-CSharp.pidb
	Fighter.userprefs
Testing

Testing