update chatroom
fix UI
Merge branch 'develop' into feature/dev-charles-merged

Conflicts:
	app.js
	public/js/main.js
	views/index.jade
update send message
no message
Merge branch 'feature/dev-yvonne' into feature/dev-charles-merged
Merge branch 'feature/dev-charles-merged' into feature/dev-eddie-extends-develop

Conflicts:
	public/js/main.js
merge c + y + t +e +d