count support
Merge branch 'master' of github.com:DenerosArmy/Inventory
added search functionality
fixed merge conflicts