Remote merge
Merge branch 'master' of https://github.com/Herbstein/PiratesOfTheFrontier

Conflicts:
	Assets/Scripts/Player/PlayerInputManager.cs
Merge branch 'master' of https://github.com/Herbstein/PiratesOfTheFrontier