first commit
merge
registration validation updated
아오... currentPage...
Merge remote-tracking branch 'origin/bkim' into Yun
수정 최종 전단계...
Merge remote-tracking branch 'origin/recipe' into Yun

Conflicts (충돌 해결)
	WebContent/view/recipe/listRecipe.jsp
	WebContent/view/recipe/readRecipe.jsp
Merge remote-tracking branch 'origin/recipe' into Yun
Merge remote-tracking branch 'origin/nathan' into Yun
Merge remote-tracking branch 'origin/nathan' into Yun
오후 2시까지의 작업내용 머지 완료
commit