no commit fixing conflicts
final changes made to project fixing errors made from conflicts with merge from
Kevin's database structures, also there was some removal of UI stylesheet and changes
I hope Luke doesn't mind
changes to make the program run for now
Merge branch 'umass_branch' of https://github.com/jjliang/databaseui into umass_branch