Merge branch 'master' of https://github.com/theorm/scrollMonitor into remove-jquery

Conflicts:
	package.json