commit
Merge branch 'master' of https://github.com/pbezant/resume

Conflicts:
Adding parralax functionality