Explosion mit segfaults

Signed-off-by: r0bbE <stefan.reinhold@chello.at>

Signed-off-by: r0bbE <stefan.reinhold@chello.at>
Merge branch 'master' of https://github.com/smiw314/ITP2

Conflicts:
	Bullethell.depend
	main.cpp