added trade modal form
Styled the modal
resolved merge conflicts
most recent version of trade_modal
Merged with master to integrate Bob's changes
merging Bob's updates
added buttons and started styling preview modal
merged with master
functionally complete
styling trade modals
Merge remote-tracking branch 'alasdair-remote/trade_modal'