Added scrolling function so that it scrolls from bottom to top
fixed merge
Merge branch 'master' of https://github.com/alisonelizabeth/chatapp into mochatest

Conflicts:
	app/scripts/main.js
Added tests, one passing and one failing