conflict 해결
회원들... 이랑 회원정보 수정 아주 조금 정말 아주조금
Merge branch 'master' of https://github.com/SunghyeokPark/ECHompage.git

Conflicts:
	ECHomepage/src/main/java/kr/endlesscreation/controller/HomeController.java
	ECHomepage/src/main/webapp/WEB-INF/views/photo/photoIndex.jsp