dd

Signed-off-by: ilHeo <dpdjfhthem@gmail.com>
Merge branch 'master' of https://github.com/LeeJeongHo/Hong3
final

Signed-off-by: ilHeo <dpdjfhthem@gmail.com>
finbal!!!!

Signed-off-by: ilHeo <dpdjfhthem@gmail.com>
Merge branch 'master' of https://github.com/LeeJeongHo/Hong3

Conflicts:
	AndroidManifest.xml

Signed-off-by: ilHeo <dpdjfhthem@gmail.com>