added toasties
fixed conflict
Merge branch 'master' of github.com:DenerosArmy/Inventory