dialog/t
doalog
Merge branch 'master' into vulkanmannen
små bugg
Merge remote-tracking branch 'origin/vulkanmannen'

Conflicts:
	The Seekers Way 0.2/LevelManager.cpp
	The Seekers Way 0.2/level1.png
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Kiba.cpp
	The Seekers Way 0.2/LevelManager.cpp
fix