misc
merge
teleporting to pen and back
Merge branch 'master' of github.com:ChristopherLeslie/StockholmGame
teleportation and tweaks, removed superfluous debugging