no message
Merge branch 'Newcal' of https://github.com/iziz/newcalGit into Newcal

Conflicts:
	classB.java
뉴칼 브랜치 작
no message
no message
라라
no message
Merge branch 'master' of https://github.com/iziz/newcalGit

Conflicts:
	classB.java