박봉재 main 화면 수정
Merge branch 'master' of https://github.com/tadakichi/git_home.git

Conflicts:
	NPE/src/main/webapp/WEB-INF/views/main.jsp