bös3
Merge branch 'Ameroz' of https://github.com/Vulkanmannen/TheSeekersWayProject into Ameroz

Conflicts:
	The Seekers Way 0.2/Main.cpp