hi

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

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

Conflicts:
	AndroidManifest.xml
dddkalj

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