Merge remote-tracking branch 'origin/master' into peter
sddfpdfasd
Merge branch 'master' into vulkanmannen

Conflicts:
	The Seekers Way 0.2/DialogState.cpp
resume part 1
Merge remote-tracking branch 'origin/master' into peter
Merge remote-tracking branch 'origin/peter'
fix
Merge remote-tracking branch 'origin/peter'
fix
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge branch 'vulkanmannen'

Conflicts:
	The Seekers Way 0.2/LevelManager.cpp
	The Seekers Way 0.2/StartMenu.cpp
	The Seekers Way 0.2/StartMenu.h
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
erm lvl i splash
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject