필수과목이수 조회
Merge branch 'master' of github.com:wrjeoung/haksa

Conflicts:
	WebContent/common/header.jsp
	WebContent/main/main.jsp
추가
Merge branch 'master' of github.com:wrjeoung/haksa
적용
Merge branch 'master' of github.com:wrjeoung/haksa

Conflicts:
	WebContent/WEB-INF/springController-servlet.xml
	WebContent/main/main.jsp
	src/loginout/controller/LogInOutController.java
	src/registerclass/controller/RegisterclassMainController.java
커밋
Merge branch 'master' of github.com:wrjeoung/haksa

Conflicts:
	WebContent/WEB-INF/springController-servlet.xml
커밋
Merge branch 'master' of github.com:wrjeoung/haksa

Conflicts:
	src/registerclass/controller/RegisterclassMainController.java
Merge branch 'master' of github.com:wrjeoung/haksa

Conflicts:
	src/loginout/controller/LogInOutController.java
commit
Merge branch 'master' of github.com:wrjeoung/haksa

Conflicts:
	WebContent/WEB-INF/springController-servlet.xml
	src/dao/RegisterclassDao.java