Merge pull request #7 from Ecotrust/gh-pages

Lucas update
Merge remote-tracking branch 'emma/gh-pages' into gh-pages
rename new show and small post updates