Merge branch 'master' of https://github.com/hovercrafts/website

Conflicts:
css/hover.css