end

Signed-off-by: ParkJoonKyung <applepie701@naver.com>
Merge branch 'master' of https://github.com/LeeJeongHo/Hong3

Conflicts:
	AndroidManifest.xml
Merge branch 'master' of https://github.com/LeeJeongHo/Hong3