commit to pull upstream master
add dots for merge conflict
pull latest copy
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
take out life span attr
teleport for one side fixed
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
pull latest copy
removed travisci yml file for now
Merge pull request #45 from dabeeya/master

delete travis yml file and add function for teleportation
fixed merge conflicts