Merge remote-tracking branch 'origin/Peter'
M för banor
fullscreen
Merge branch 'Ameroz' of https://github.com/Vulkanmannen/TheSeekersWayProject into Ameroz
Journal
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
dialog lr något
2 characters
2 player
Merge remote-tracking branch 'origin/master' into vulkanmannen

Conflicts:
	The Seekers Way 0.2/Level3.png
	The Seekers Way 0.2/LevelManager.cpp
	The Seekers Way 0.2/LevelManager.h
fi
dialog igen
dsf
Merge branch 'vulkanmannen'
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
stone ani
Merge remote-tracking branch 'origin/vulkanmannen'
Merge remote-tracking branch 'origin/master' into Peter