chat begins
brake
brake
Brake
Chat works
ok
Merge branch 'chat_2'

Conflicts:
	log/test.log