got scroll to work well
Merge branch 'master' of https://github.com/nijjarjatt/richardBooth

Conflicts:
	assets/js/main.js