dialog 수정중
X
Merge branch 'master' of https://github.com/gkdlfm/CML

Conflicts:
	DdongGame/DdongGame/bin/DdongGame.apk
	DdongGame/DdongGame/bin/classes.dex
	DdongGame/DdongGame/bin/classes/kr/co/ddonggame/GameRoom.class
	DdongGame/DdongGame/bin/classes/kr/co/ddonggame/MainActivity.class
	DdongGame/DdongGame/bin/classes/kr/co/ddonggame/client/ChatClient.class
	DdongGame/DdongGame/bin/classes/kr/co/ddonggame/client/Client.class
	DdongGame/DdongGame/bin/classes/kr/co/ddonggame/client/ClientThread.class
	DdongGame/DdongGame/bin/classes/kr/co/ddonggame/custom/CustomDialog.class
	DdongGame/DdongGame/bin/resources.ap_
	DdongGame/DdongGame/src/kr/co/ddonggame/custom/CustomDialog.java
	DdongGame/appcompat_v7/bin/android-support-v7-appcompat.jar