Nothing of worth
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Tottemaptest.png
minor
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

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

Conflicts:
	The Seekers Way 0.2/Tottemaptest.png