removing old makefile
merging makefiles
cleaning up
Merge branch 'master' of https://github.com/nicku33/dbcourse-p2