修改2
Merge remote-tracking branch 'origin/master'

Conflicts:
	FunctionOfIndex&Record.h
Merge branch 'master' of https://github.com/Buckfry/miniSQL