Merge branch 'master' of github.com:jasonrhodes/Scientist.js