day code
last commit
Merge branch 'DucHa' of https://github.com/duchaptit/chatyahoo into DucHa

Conflicts:
	ChatYahoo/bin/controlClient/MainChatControl$1.class
	ChatYahoo/bin/controlClient/MainViewControl$1.class
	ChatYahoo/src/controlClient/ClientUser.java
	ChatYahoo/src/controlServer/ClientConnect.java
	ChatYahoo/src/model/Setting.java
	ChatYahoo/src/view/MainViewYahoo.java