Filled in Inventory class
Merge branch 'inventory'
Merge branch 'master' of https://github.com/danmartelly/SugarRush