Merge branch 'master' of https://github.com/LisbethRasmussen/IslandAdventure

Conflicts:
	IslandGame/Assets/IslandGame2.unity
sdf