eh sean efter inte jobbat på¨ett tag
Merge branch 'master' into sean

Conflicts:
	Assets/Prefabs/prefab_player.prefab
Merge branch 'master' into johannes

Conflicts:
	Assets/Prefabs/prefab_ghost.prefab