testing deploy script requires git commits
Merge branch 'master' into gh-pages