"adding a splash screen"
Fixing merge conflicts
"Made some changes to backend to user Barcode and trying to merge back
and front end"
"Testing saving functionality"
Merge branch 'master' of https://github.com/Wuzseen/CS451_InventoryApp.git
"Got the SQL loading and fetching working - Maria & Tim"