index update
Merge branch 'master' of https://github.com/trajeta/doore_src.git
회원가입 update
Merge branch 'master' of https://github.com/trajeta/doore_src.git

Conflicts:
	doore/src/com/bit/java54th/softdrink/doore/dao/MySqlVillageDAO.java
Merge branch 'master' of https://github.com/trajeta/doore_src.git

Conflicts:
	doore/WebContent/WEB-INF/index.jsp