Merge branch 'master' into Woonohyo
Merge branch 'master' into Woonohyo
Studying HF Servlet
headFirst package created
Testing ServletConfig
HTML & CSS Studying
HTML & CSS Studying
keep studying headFirst
studying headFirst
이미지 검색 기능 구현
사진 삽입/삭제 가능
Merge branch 'master' into Woonohyo

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/index.jsp
merging commit
add link from 'main' to 'create'
remove useless items
remove conflitable files
Merge branch 'master' into Woonohyo

Conflicts:
	.gitignore
	src/main/webapp/create.jsp
	src/main/webapp/index.jsp
	src/main/webapp/login.jsp
	src/main/webapp/logout.jsp
	src/main/webapp/main.jsp
	src/main/webapp/script/main.js
	src/main/webapp/signup.jsp
	src/main/webapp/signupResult.jsp
	src/main/webapp/style/main.css
	src/main/webapp/welcome.jsp
Merge branch 'Woonohyo'
create.jsp에 대한 링크 설정 변