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
Merge pull request #44 from rootulp/master

change javascript file structure to require dependencies within each sub...
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 both teleports
Merge pull request #46 from dabeeya/master

fixed both teleports
one wall working
working walls
Merge pull request #47 from cassiemoy/master

Fix walls so that sprites collide.