Portal v1.0
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Main.cpp
Merge remote-tracking branch 'origin/master' into Vulkanmannen