Merge pull request #3 from thisMagpie/master

merge pages
Merge pull request #4 from thisMagpie/gh-pages

Merge pull request #3 from thisMagpie/master