Mergin master and gh-pages

This merge should be done when we want to deploy to github pages.