asd
Merge branch 'vulkanmannen'
Merge branch 'Ameroz'

Conflicts:
	The Seekers Way 0.2/Main.cpp