数据库测试

数据库
Merge branch 'master' of https://github.com/chenjiang3/NIOServer

Conflicts:
	src/com/wind/db/DBTest.java