del
Merge branch 'master' of github.com:Jojendersie/Lightingbolt
I'am Blob the player.
Merge branch 'master' of github.com:Jojendersie/Lightingbolt

Conflicts:
	Lightingbolt/src/gamestates/Ingame.cpp
swing swing