bunch of tweaks, media query on paralax images, and changed top nav color/texture
discarded my changes and chose alex's for hero image and fixed merge conflicts