initial commit, already far into project
Merge branch 'master' of https://github.com/zisko/stockroom... initial merge