Merge remote-tracking branch 'origin/master' into Vulkanmannen
asd
version 1.0
Merge remote-tracking branch 'origin/Vulkanmannen'

Conflicts:
	The Seekers Way 0.2/Main.cpp