more persistence n whatnot
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/jebadirad/CSC335FinalProject.git
more changes to item and inventory