added Inventory to Main
Final commit
Merge branch 'Chris'