Hey
Merge branch 'master' of https://github.com/kirkemmie/PageMotion

Conflicts:
	js/PageMotion.js