Trying to fix MainActivity issues
Merge branch 'master' of https://github.com/Wuzseen/CS451_InventoryApp
Fixed merge issues in MainActivity.java