컴;ㅅ
Merge branch 'master' of https://github.com/IanKim-Git/LogTeam.git

Conflicts:
	ProgManager/src/main/java/conf/ProgSQLMapper.xml
	ProgManager/target/classes/conf/ProgSQLMapper.xml
projectInfo 120%완성!!!!
Merge remote-tracking branch 'origin/0820_hsn_culcheck'
커밋
Merge remote-tracking branch 'origin/0820_hsn_culcheck'
프로젝트 정보 1차 수정