Revert "Merge branch 'gravity' into weapons"

Conflicts:
	generator
	generator.c
	one.lev
	player
	player.c