xxi
hello 中有数据库
Merge remote-tracking branch 'origin/master' into xr

Conflicts:
	hello.txt
数据库
delete
Merge remote-tracking branch 'origin/master' into xr

Conflicts:
	hello.txt
The SQL Connection
SQL change
Merge pull request #12 from HollyDAI/2C

2 c
wu
baseDao
Pageage adding
Merge pull request #13 from HollyDAI/2C

Pageage adding
Merge pull request #14 from HollyDAI/xr

Xr
Delete ConnectWithSQL.java
更改connent with sql
Merge pull request #17 from HollyDAI/master

pull