adding in new content from Abi
Merge branch 'trading_site_template' of https://github.com/alexsteingart/PublicWebsite into trading_site_template