partial update commit
Merge branch 'master' of github.com:LucidComplex/inventory-system
added login functionality
fix merge conflicts