머지 테스트
Merge branch 'master' of https://github.com/IanKim-Git/LogTeam.git

Conflicts:
	ProgManager/WebContent/index.html