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