kk
Merge branch 'master' of https://github.com/mupengfei/WebCrawler

Conflicts:
	.classpath
	.settings/org.eclipse.core.resources.prefs
	WebRoot/DianPing.jsp
	WebRoot/DianPingPost.jsp
	WebRoot/Sina.jsp
	WebRoot/TaoBao.jsp
	WebRoot/TaoBaoPost.jsp
	WebRoot/TianYa.jsp
	WebRoot/TianYaPost.jsp
	WebRoot/WEB-INF/classes/WebCrawler.class
	WebRoot/WEB-INF/classes/com/webcrawler/crawlers/DianPCrawler.class
	WebRoot/WEB-INF/classes/com/webcrawler/crawlers/TianYaCrawler.class
	WebRoot/WEB-INF/classes/com/webcrawler/db/utils/DBHelper.class
	WebRoot/WEB-INF/classes/com/webcrawler/sina/Sina.class
	WebRoot/WEB-INF/classes/com/webcrawler/view/TaoBaoDao.class
	WebRoot/WEB-INF/web.xml
	src/com/webcrawler/crawlers/DianPCrawler.java
	src/com/webcrawler/db/utils/DBHelper.java
	src/com/webcrawler/view/TaoBaoDao.java