Merge pull request #6 from brianmcgue/gh-pages

Updating branches to be on same commit