fixi fixi
Merge remote-tracking branch 'origin/master' into Vulkanmannen
shield
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Charlotte.cpp
	The Seekers Way 0.2/Shield.cpp
	The Seekers Way 0.2/Shield.h
conflict
map
minor change
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge remote-tracking branch 'origin/master' into Peter