Merge github
adding trade
Merge