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

cx
Merge branch 'Ameroz'

Conflicts:
	The Seekers Way 0.2/Kiba.cpp
random
Merge remote-tracking branch 'origin/Peter'

Conflicts:
	The Seekers Way 0.2/Kiba.cpp
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
doalog
Merge branch 'master' into vulkanmannen