Merge pull request #3 from justingreco/master

merge pull request #2 from justingreco/master
Merge pull request #4 from justingreco/gh-pages

Merge pull request #4 from justingreco/master