ranking 작업중
Merge branch 'master' of https://github.com/tae1560/battler_dog

Conflicts:
	src/contest/lab/gala/JoinActivity.java
	src/contest/lab/gala/LoginActivity.java
hi