retrying deploy
Merge branch 'master' into gh-pages
Merge pull request #3 from KevinEdwardBerry/gh-pages

rebase