File test
Merge branch 'master' of git@github.com:mikegostev/DBSpeedTest.git

Conflicts:
	src/bdb/FillBDB.java
	src/bdb/QueryBDB.java