Deploy script
Merge branch 'master' into gh-pages
Added push to deploy script
Merge branch 'master' into gh-pages