Merge pull request #5 from thatkevin/gh-pages

merge
Merge pull request #6 from thatkevin/master

Merge pull request #5 from thatkevin/gh-pages