Work in progress on the inventory page
Merge branch 'master' of https://github.com/kevinmee/FinalProject