shield void
tisdag peters arbete
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
alexs fix
Merge remote-tracking branch 'origin/Ameroz'
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Charlotte.cpp
Sheekadash removal
Shield Working (with door class)
shield class
project interact v0.1
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
Merge remote-tracking branch 'origin/Vulkanmannen'

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

Conflicts:
	The Seekers Way 0.2/Character.h
	The Seekers Way 0.2/Entity.h
	The Seekers Way 0.2/EntityManager.cpp