commit
Merge branch 'master' of https://github.com/bananabipac/SleepyTerror

Conflicts:
	ProjectSettings/InputManager.asset
Merge branch 'master' of https://github.com/bananabipac/SleepyTerror

Conflicts:
	Assets/Prefabs/Triggers/Jumper.prefab
	ProjectSettings/TagManager.asset