Revert "Merge branch 'level_design'"

This reverts commit bbcc2503e1f9f74dab58e82a1429f440fe8a33e9, reversing
changes made to 8ddff15172f31aeef4ea0120ac0f337c637a41e1.

Conflicts:
	starz/starz.pde