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

Conflicts:
	css/hover.css