Merge pull request #2 from hurley25/gh-pages

new merger