slash 0.1
portal 0.5
port
Merge remote-tracking branch 'origin/master' into Vulkanmannen

Conflicts:
	The Seekers Way 0.2/Charlotte.cpp
	The Seekers Way 0.2/Entity.h
	The Seekers Way 0.2/Main.cpp
	The Seekers Way 0.2/The Seekers Way.vcxproj
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters