SKSFinal/src/main/webapp/WEB-INF/jsp/menu.jsp
Merge branch 'master' of github.com:Kaninsokk/SKSFinal

Conflicts:
	SKSFinal/src/main/webapp/WEB-INF/jsp/menu.jsp
Merge branch 'master' of github.com:Kaninsokk/SKSFinal
Merge branch 'master' of github.com:Kaninsokk/SKSFinal

Conflicts:
	SKSFinal/src/main/webapp/WEB-INF/jsp/menu.jsp
Merge branch 'master' of github.com:Kaninsokk/SKSFinal

Conflicts:
	SKSFinal/src/main/java/com/team4/sksfinal/beans/Subject.java
	SKSFinal/src/main/java/com/team4/sksfinal/controllers/SubjectController.java
	SKSFinal/src/main/webapp/WEB-INF/tiles.xml