Merge branch 'master' of https://github.com/DavidFarrell/CaptainBlood

Conflicts:
Assets/Scripts/Character_Walk.cs
Assets/Scripts/PlayerController.cs
faf