Merge pull request #7 from kms2413/master

풀리
Merge pull request #8 from kms2413/master

준태형꺼까지 합침
20141207
Merge branch 'master' of https://github.com/ruinra/yodde_spring.git

Conflicts:
	yodde/.settings/org.eclipse.core.resources.prefs
	yodde/src/main/java/com/yodde/storeModel/StoreDao.java
	yodde/src/main/java/com/yodde/storeModel/StoreDaoImp.java
	yodde/src/main/java/com/yodde/storeModel/StoreMapper.xml
	yodde/src/main/webapp/WEB-INF/spring/root-context.xml
	yodde/src/main/webapp/WEB-INF/views/main/main.jsp
141207
141208
Merge pull request #1 from ruinra/master

형님 보고싶어요~