Merge branch 'Yuan' of https://github.com/CountryLoad/LessCharges
read data from network
Mysql work!
Merge branch 'master' of github.com:CountryLoad/LessCharges
new files about inserting  and reading
更改读出类型
LessCharges
LessCharges
添加联通短信文本解析text_analysis.php
Merge branch 'master' of github.com:CountryLoad/LessCharges
For term3!!!!!!!!!!!!!!!
Merge branch 'zhang' of github.com:CountryLoad/LessCharges into XL

Conflicts:
	My/index.html
Merge branch 'zhang' of github.com:CountryLoad/LessCharges

Conflicts:
	newtables.php~
Merge branch 'XL'

Conflicts:
	My/css/jquery.bigautocomplete.css