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

Conflicts:
css/hover.css
index.html
js/main.js
Merge branch 'master' of github.com:hovercrafts/website

Conflicts:
	css/hover.css
	index.html
	js/main.js