Merge pull request #7 from michaelohm/parallax

Parallax
Merge pull request #8 from michaelohm/parallax

asdf
resolved merge conflict, added navigation and styling
Merge pull request #9 from michaelohm/navigation

resolved merge conflict, added navigation and styling
fucked
fixed merge conflict