kljnljol
Merge branch 'master' of https://github.com/tadakichi/git_home

Conflicts:
	NPE/src/main/webapp/WEB-INF/views/blank.jsp
	NPE/src/main/webapp/WEB-INF/views/main.jsp
	NPE/src/main/webapp/WEB-INF/views/register.jsp
	NPE/src/main/webapp/WEB-INF/views/scheduler.jsp
	NPE/src/main/webapp/WEB-INF/views/view.jsp
	NPE/src/main/webapp/WEB-INF/views/write.jsp
diary read파트 1차
Merge branch 'master' of https://github.com/tadakichi/git_home

Conflicts:
	NPE/src/main/webapp/WEB-INF/views/main.jsp
	NPE/src/main/webapp/WEB-INF/views/register.jsp
	NPE/src/main/webapp/WEB-INF/views/write.jsp
Merge branch 'master' into my1

Conflicts:
	NPE/src/main/webapp/WEB-INF/views/blank.jsp
	NPE/src/main/webapp/WEB-INF/views/main.jsp
	NPE/src/main/webapp/WEB-INF/views/register.jsp
	NPE/src/main/webapp/WEB-INF/views/view.jsp
	NPE/src/main/webapp/WEB-INF/views/write.jsp
Merge branch 'master' of https://github.com/tadakichi/git_home

Conflicts:
	NPE/src/main/webapp/WEB-INF/views/blank.jsp
	NPE/src/main/webapp/WEB-INF/views/main.jsp
ㅁㅁ
12/6 (토) 봉재형이 고쳐서 올려준 UI 내거와 합치면서 UI 수정
view페이지 무한스크롤 적용
Merge branch 'master' of https://github.com/tadakichi/git_home

Conflicts:
	NPE/src/main/webapp/WEB-INF/views/scheduler.jsp
진영이형 스케쥴러 + 준일 diary 무한스크롤