prepping to upload to github
another update?
Merge branch 'master' of https://github.com/hitjim/dojo