tradehistory file
Merge branch 'dev' of github.com:heartbit/hackathon into dev
jpioj
label+david ok