working...
Merge branch 'master' of https://github.com/benwnuk/ScrollJunkie

Conflicts:
	assets/scrolljunkie.js.map