Merge remote-tracking branch 'origin/master' into peter
textboxloop fix
Merge remote-tracking branch 'origin/peter'
Merge remote-tracking branch 'origin/master' into peter
Levels
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Levels and Stuff
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Levels
Levels
fixal
dialogue music
Merge remote-tracking branch 'origin/peter'
asd
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
merge
Merge remote-tracking branch 'origin/master' into peter

Conflicts:
	The Seekers Way 0.2/Dialoger/Level5StartDialogue.xml
	The Seekers Way 0.2/musik lista.txt
Merge remote-tracking branch 'origin/peter'
dll
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject