Merge pull request #6 from Webpiki/gh-pages

ss
Merge branch 'HEAD' of https://github.com/Webpiki/webpiki.git into webpiki
testimonial
Merge branch 'webpiki' of https://github.com/Webpiki/webpiki into webpiki
Merge pull request #7 from Webpiki/webpiki

Webpiki