updating
ok
Merge branch 'master' of github.com:alisonelizabeth/chatapp into modal
added initial  modal on webpage opening
changed header and added input
added modal stylings
added even more stylings
preparing for initial pull into master
retrying prep for modal pull into master
Fix merge conflicts
Fix merge conflict with scrolling
Merge branch 'master' of https://github.com/alisonelizabeth/chatapp into mochatest

Conflicts:
	.DS_Store
	app/scripts/main.js
	app/styles/main.scss
Fixed scrolling