modif3
Merge branch 'master' of https://github.com/maidmaid/hesso-chat

Conflicts:
	test/Dany.java