Merge pull request #16 from jeffdavidthompson/master

Updates my branch to avoid future merge issues
preparing for pull
preparing for pull
Merge branch 'workingJS' of github.com:jeffdavidthompson/adventurepage into workingJS

allows pull
git got weird
Merge pull request #20 from jeffdavidthompson/workingJS

Working js
fix merge conflict
delete tree.js to resolve merge conflict