Update By JLGSHK
Update
Merge branch 'master' of https://github.com/jlgshk/LearningMVC

Conflicts:
	src/main/webapp/WEB-INF/error/404.jsp
	src/main/webapp/WEB-INF/web.xml