beau009
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Game.unity
	Assets/Scenes/Game/NavMesh.asset
	Assets/Scenes/Menu.unity
	Assets/Scripts/Player/TrapBuilder.cs
	Assets/animations.meta
	Assets/animations/Materials.meta
	Assets/animations/character@dead.fbm.meta
	Assets/animations/character@dead.fbm/Character.jpg.meta
	Assets/animations/character@dead.fbm/texturestaff.jpg.meta
	Assets/animations/character@idle.fbm.meta
	Assets/animations/character@idle.fbm/Character.jpg.meta
	Assets/animations/character@idle.fbm/texturestaff.jpg.meta
	Assets/animations/character@stillshoot.fbm.meta
	Assets/animations/character@stillshoot.fbm/Character.jpg.meta
	Assets/animations/character@stillshoot.fbm/texturestaff.jpg.meta
	Assets/animations/character@walk.fbm.meta
	Assets/animations/character@walkshoot.fbm.meta
	Assets/animations/character@walkshoot.fbm/Character.jpg.meta
	Assets/animations/character@walkshoot.fbm/texturestaff.jpg.meta
	Assets/characternew/characterAnims.controller
	Assets/characternew/charafcrertexture_0001.c4d.meta