need to pull
Merge branch 'master' of https://github.com/Gwalks/Pandemonium

Conflicts:
	Code/Assets/Animation/Clips/MainCharacter.prefab.meta~HEAD.meta
changed the animations on the Guard, just the shoot and alert
Merge branch 'master' of https://github.com/Gwalks/Pandemonium
Merge branch 'master' of https://github.com/Gwalks/Pandemonium