#23 Finish the queries
Merge branch 'Product' of https://github.com/szelli/Goods-Exchange into Product