yup
Merge branch 'master' of https://github.com/graphitezeppelin/dbTermProject
bug and delete