join
Merge branch 'master' of https://github.com/tae1560/battler_dog

Conflicts:
	src/contest/lab/gala/JoinActivity.java
회원가입 중