merging ui work with db manager
Merge branch 'master' of https://github.com/bmcdo248/CIS340CourseProject