working on dynamic height
working on dynamic height
merge from jian
Merge branch 'master' of github.com:DenerosArmy/Inventory
working on top nav bar shit
merged with jian's notification. changed style to white with sketch background