Merge branch 'gh-pages' into develop-simpler
A bit of styling
Merge branch 'develop-simpler' into gh-pages