Merge remote-tracking branch 'origin/master' into Peter
random
Merge remote-tracking branch 'origin/master' into Peter
random
Merge remote-tracking branch 'origin/Peter'

Conflicts:
	The Seekers Way 0.2/Kiba.cpp
dialoguestate
dialog
dialogue
Merge remote-tracking branch 'origin/vulkanmannen'

Conflicts:
	The Seekers Way 0.2/Level2.png
	The Seekers Way 0.2/LevelManager.cpp
	The Seekers Way 0.2/level1.png
dialog/t
doalog
Merge branch 'master' into vulkanmannen
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/LevelManager.cpp
små bugg
stone
Merge remote-tracking branch 'origin/master' into Peter
Merge remote-tracking branch 'origin/vulkanmannen'

Conflicts:
	The Seekers Way 0.2/LevelManager.cpp
	The Seekers Way 0.2/level1.png
fix
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