Reverted back original DBFile.cc and DBFile.h, the one from the backup of assignment 1 submission
Merged conflicts