git ignore
Merge branch 'master' of https://github.com/elfiwig/repository_mac

Conflicts:
	projectForStudy01/src/projectForStudy01/testClass.java
충돌 해결
개발 끝!