jsp_header.jsp conflict 해결
Merge branch 'LJY' of https://github.com/freenice12/cafetest.git into LJY