작업중....
처음보는 에러, commit 시도
Merge branch 'master' of https://github.com/IanKim-Git/LogTeam.git

Conflicts:
	ProgManager/WebContent/WEB-INF/view/projectInfo.jsp
	ProgManager/WebContent/WEB-INF/view/projectMain.jsp
	ProgManager/src/main/java/conf/ProgSQLMapper.xml
	ProgManager/src/main/java/sub/controller/ProjectController.java