Sprint 2.
Merge branch 'master' of https://github.com/Wampirue/Warehouse