waljump
sdaf
asd
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