Merge pull request #7 from thatkevin/gh-pages

merge
Merge pull request #8 from thatkevin/master

Merge pull request #7 from thatkevin/gh-pages