waljump
sdaf
Spiketrap
Merge branch 'master' into Ameroz

Conflicts:
	The Seekers Way 0.2/Shield.cpp
Spiketrap
asd
Fireball/FireRune/Spiketrap
walljump shield and global life
Merge remote-tracking branch 'origin/master' into Vulkanmannen

Conflicts:
	The Seekers Way 0.2/Shield.cpp
	The Seekers Way 0.2/Tottemaptest.png
f
Spike
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject
darkbinding
walljump magicswitch
Merge remote-tracking branch 'origin/Vulkanmannen'

Conflicts:
	The Seekers Way 0.2/Entity.h
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters
Fireball/Rune/Animation/spiketrap
Merge branch 'master' of https://github.com/Vulkanmannen/TheSeekersWayProject

Conflicts:
	The Seekers Way 0.2/Tottemaptest.png
Merge remote-tracking branch 'origin/Peter'

Conflicts:
	The Seekers Way 0.2/Entity.h
	The Seekers Way 0.2/EntityManager.cpp
	The Seekers Way 0.2/Main.cpp
	The Seekers Way 0.2/The Seekers Way.vcxproj
	The Seekers Way 0.2/The Seekers Way.vcxproj.filters