Merge branch 'master' of https://github.com/dlisanov/inventoryPC.git