Merge branch 'master' of https://github.com/alisonelizabeth/chatapp into mochatest

Conflicts:
	app/scripts/main.js
Added tests, one passing and one failing
Merge branch 'master' of https://github.com/alisonelizabeth/chatapp into mochatest

Conflicts:
	.DS_Store
	app/scripts/main.js
	app/styles/main.scss
Fixed scrolling
Merge pull request #13 from alisonelizabeth/mochatest

Added passing Mocha test, fixed scrolling