Merge branch 'master' into gh-pages

Conflicts:
css/styles.css
index.html