2 characters
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
Merge branch 'vulkanmannen'