Final commit before production.
Merge branch 'master' of https://github.com/Jmac217/inventory