zhaodiao, kan
Merge branch 'master' of https://github.com/Th0ar/DS-MiniSQL

Conflicts:
	src/MiniSQL.cpp