update
Merge remote-tracking branch 'origin/master'

Conflicts:
	miniSQL/miniSQL/catalog_manager.h
	miniSQL/miniSQL/miniSQL.vcxproj.filters
	miniSQL/miniSQL/table.h
Revert "update"

This reverts commit c4d705e0499b60434f7c7a79a8b8157b5599ec0b.
Revert "Revert "update""

This reverts commit 9c92ef1e0b990a8e73d0c6da5a92ac8db3a8c296.