changed makefile
btree.h testing
Merge branch 'master' of https://github.com/RomanSchwienbacher/DBI.git

Conflicts:
	DBImpl/source/index/btree.h