doesn't matter
Merge branch 'master' of https://github.com/New-Begin/Touch.git

Conflicts:
	bin/Touch.apk
	bin/classes.dex
	bin/classes/com/newbegin/touch/LoginActivity$1.class
	bin/classes/com/newbegin/touch/LoginActivity$3.class
	bin/classes/com/newbegin/touch/LoginActivity.class
	bin/classes/com/newbegin/touch/RegisterActivity$1.class
	bin/classes/com/newbegin/touch/RegisterActivity$2.class
	bin/classes/com/newbegin/touch/RegisterActivity$Result.class
	bin/classes/com/newbegin/touch/RegisterActivity.class
	bin/classes/com/newbegin/touch/utils/SocketConnect$1.class
	bin/classes/com/newbegin/touch/utils/StatusCode.class
	src/com/newbegin/touch/LoginActivity.java
	src/com/newbegin/touch/RegisterActivity.java
	src/com/newbegin/touch/utils/StatusCode.java