wave, flipper
Merge remote-tracking branch 'origin/master'

Conflicts:
	wurst/content/creeps/Flipper.wurst
	wurst/init/Waves.wurst