Merge pull request #8 from jamieleung/master

Merge gh-pages into master
Merge branch 'master' into gh-pages
Amended layout folder name
Merge branch 'gh-pages'