- #5 multi users chat room
- #34 added conversations state #18 rename message thread to conversation
- #30 add Mocha and supertest
Merge branch 'master' into css

Conflicts:
	public/app.min.css
	public/app.min.css.map