Merge branch 'work-in-progress' to master.

Conflicts:
index.html
styles.css