테스트
Merge branch 'master' of https://github.com/Johyeona/java57.git
Merge branch 'master' of https://github.com/Johyeona/java57.git
수정
Merge branch 'master' of https://github.com/Johyeona/java57.git

Conflicts:
	bitTest/src/bitTest/test2.java