Animations and stuff
Merge branch 'master' of https://github.com/mguzdial3/AngryCuttlefish

Conflicts:
	mbradley36-p4/Assembly-CSharp.pidb
	mbradley36-p4/Library/ScriptAssemblies/Assembly-CSharp.dll
	mbradley36-p4/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	mbradley36-p4/Library/assetDatabase3
	mbradley36-p4/Library/expandedItems
	mbradley36-p4/Library/guidmapper
	mbradley36-p4/Library/metadata/2c/2c48740cfaf07497eb8f2af9eeda1625
	mbradley36-p4/Library/metadata/56/56a487e7d4d5c4f3ba50642e077c4cc1
	mbradley36-p4/Library/metadata/6c/6cfc7a3a81619411394601b56fd39725
	mbradley36-p4/Library/metadata/96/963f87639f92c4cd18ff6151346daaf2
	mbradley36-p4/Library/metadata/a7/a7883868a24834b2aa8c8aa070f1876d
	mbradley36-p4/Library/metadata/c2/c21b52f6114344463b00bac50506dd56
	mbradley36-p4/Library/metadata/ff/ff23c37b988184209839c78c75063601
	mbradley36-p4/mbradley36-p4-csharp.sln
	mbradley36-p4/mbradley36-p4.sln
	mbradley36-p4/mbradley36-p4.userprefs