Merge pull request #10 from Webpiki/gh-pages

Merge pull request #9 from Webpiki/webpiki
Merge pull request #11 from Webpiki/webpiki

Merge pull request #10 from Webpiki/gh-pages