teleporting won't kill
Merge branch 'master' of github.com:ChristopherLeslie/StockholmGame
refactoring, fewer teleport deaths
merge