modify 1.sql,add 2.txt
Merge branch 'master' of https://github.com/limingf/test2

Conflicts:
	1.sql