Parameterized the death line
WHOA
CHRIS SAVES CHRISTMAS!
Merge branch 'master' into screen_scrolling

Conflicts:
	player.lua