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

Conflicts:
	js/main.js