Have chatmessages in a div with an username
Merge branch 'styling_kondou'
Merge branch 'master' into conversation_typo_and_no_tutorials

Conflicts:
	js/main.js