Merge branch 'master' into gh-pages
pushing JS up
updating .gitignore to watch the .js
Merge branch 'gh-pages'
first draft