pull error로 인해 commit
Merge branch 'HEAD' of https://github.com/kozmo12345/wanple.git into
HEAD

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