parallaxy type scrolling
Merge branch 'master' of https://github.com/ChildAbusePreventionKit/CAP

Conflicts:
	public/js/main.js