Level 1

Bort med Totte
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Maps/level1.png
gitsd
Merge remote-tracking branch 'origin/master' into peter

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

Conflicts:
	The Seekers Way 0.2/Maps/level1.png
fix
shange
Merge branch 'vulkanmannen'

Conflicts:
	The Seekers Way 0.2/Dialoger/Level6EndDialogue.xml
	The Seekers Way 0.2/Maps/Level2.png
	The Seekers Way 0.2/Maps/Level3.png
	The Seekers Way 0.2/Maps/Level4.png
	The Seekers Way 0.2/Maps/Level5.png
	The Seekers Way 0.2/Maps/Level6.png
	The Seekers Way 0.2/Maps/level1.png
menymusic
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/State.cpp
dialog next fix
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
fix
Merge remote-tracking branch 'origin/peter'
asd
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
asd
Merge branch 'master' into Ameroz

Conflicts:
	The Seekers Way 0.2/IntroScreen.cpp
	The Seekers Way 0.2/IntroScreen.h
	The Seekers Way 0.2/sfTheora-1.4/Readme.txt