test112

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

Conflicts:
	src/JaeHyun/JaeHyunActivity.java