Merge pull request #25 from estelle/master

Merge from Master
Merge pull request #28 from estelle/gh-pages

push pages to prod