fucked
fixed merge conflict
Merge pull request #10 from michaelohm/parallax

Parallax