finish make_trades maybe
Merge branch 'master' of https://github.com/chopstickninja/stocky