mmmmmmmmmmmm
Merge branch 'master' of https://github.com/bodedoctor/destroy

Conflicts:
	Assets/Resources/Meshes/SoldierAnimationController.controller