Merge pull request #6 from brianmcgue/gh-pages

Updating branches to be on same commit
Merge pull request #7 from brianmcgue/master

Merge pull request #6 from brianmcgue/gh-pages