updating
Merge branch 'master' of https://github.com/Th0ar/DS-MiniSQL

Conflicts:
	src/Index.cpp
	src/Index.h