Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Uses a CDN for jQuery
Merge branch 'master' into gh-pages