Merge branch 'combine_wip_db_and_MoleculeClass' of agile.bu.edu:ec504/ec504_projects/group4 into combine_wip_db_and_MoleculeClass