df
uppdatera en
asd
project interact v0.1
Merge remote-tracking branch 'origin/master' into Peter
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
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Charlotte.cpp
	The Seekers Way 0.2/Shield.cpp
Conflikt - Charlotte/Shield
s
Merge remote-tracking branch 'origin/master' into Vulkanmannen
Merge remote-tracking branch 'origin/Peter'
Merge remote-tracking branch 'origin/master' into Peter
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
fix
asd
Merge remote-tracking branch 'origin/Peter'
Merge remote-tracking branch 'origin/master' into Peter
Merge remote-tracking branch 'origin/master' into Peter