Merge pull request #1 from justinwp/gh-pages

add gh-pages to master
Merge pull request #2 from justinwp/master

Merge pull request #1 from justinwp/gh-pages