Basic scrolling methods added
Merge branch 'master' into spike_scrolling

Conflicts:
	javascripts/application.js
Merge pull request #3 from alistairhill/scrolling

Scrolling