Initial DB stuff
Code review changes
conflict changes@
Coflicts
small changes
conflict
conflict
conflicts

h 'master' into DB_Branch

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
mmit.
Merge pull request #8 from HallCat/DB_Branch

Added Database for Products & upgrading