FIX!!!!!!
Merge branch 'master' of https://github.com/ajgoley/inventory.git