int 추가
a = 6; 변경
Merge branch 'master' of https://github.com/SangWonHan/JavaProject.git

Conflicts:
	Mud Project/src/TestProj.java