shooting
Merge branch 'master' of https://github.com/olben/MankindsFinestHour

Conflicts:
	Assets/Scripts/Character.cs
	Assets/Scripts/PlayerManager.cs
Merge branch 'master' of https://github.com/olben/MankindsFinestHour