fixed jumping at the top of the screen (for now)
Merge remote-tracking branch 'origin/top_screen'

Conflicts:
	src/smw/Game.java