Merge remote-tracking branch 'origin/master' into Peter
Merge remote-tracking branch 'origin/Peter'
interact v0.1.3
fixi fixi
Merge remote-tracking branch 'origin/master' into Vulkanmannen
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