status
Merge branch 'master' of https://github.com/zhouzhaoping/miniSQL

Conflicts:
	README.md