처음
Merge branch 'ksk_branch' of github.com:KimMinJeong/allready into ksk_branch

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	WebContent/WEB-INF/web.xml
modify