Sicknesssplashes
Merge branch 'Dev' of http://github.com/Mrmaxmeier/Parabelflug

Conflicts:
	player.lua