Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Update script.js link to be dynamic
Merge branch 'gh-pages'
update