Commit before fetch
Merge branch 'master' into leepan
그냥 커밋
Merge remote-tracking branch 'origin/master'

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
Controller Test 고침
Merge branch 'master' into leepan
Merge remote-tracking branch 'origin/master'

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' into leepan
LocVO 추가
GetWeather추가
UserController에서 위도, 경도 받기 추가
MainController에서 위도, 경도에 따른 날씨 반환 등...
pom
dirty dir commit ex
Merge branch 'master' into leepan

Conflicts:
	NPE/src/main/java/org/npe/diary/service/DiaryService.java
	NPE/src/main/java/org/npe/web/MainController.java
	NPE/src/main/java/org/npe/web/UserController.java
	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
leepan commit before push