Merge branch 'master' of github.com:alisonelizabeth/chatapp into layout
chat window should be closing
put node_modals back in gitignore
removed bower comps from gitignore
Fix merge conflict
fixed merge conflict