sorting out indents in the JS
attempt and making the button stay in the right place
Merge remote-tracking branch 'upstream/master'
deleting stuff to do with old parallax scrolling