Merge branch 'master' into gh-pages
add google analytics to page
Merge branch 'gh-pages'