Animations added
Commit bitch
Punching animations added
commit
Cleaned up branch and prepared for merge
Merge remote-tracking branch 'origin/MergeBranch'

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/AnimationControllers.meta
	Assets/Animations.meta
	Assets/Models.meta
	Assets/Models/Jack1_Ax.FBX.meta
	Assets/Models/Materials.meta
	Assets/Models/Materials/No Name.mat.meta
	Assets/Models/Materials/default.mat.meta