något
death scrren
Merge branch 'Ameroz'

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

Conflicts:
	The Seekers Way 0.2/Level3.png
EntityManager.cpp
Level1Object.png
Level1Object
Death
minor changes
fenrir bös
Merge remote-tracking branch 'origin/master' into Peter

Conflicts:
	The Seekers Way 0.2/EntityManager.cpp