작업 중

Signed-off-by: pjh224 <pjh224@naver.com>
Merge branch 'master' of https://github.com/LeeJeongHo/Hong3
비밀번호 입력 추가했습니다. 비번:0000

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

Conflicts:
	AndroidManifest.xml