trying to fix stuff
Merge branch 'master' of https://github.com/caitlinhickey/predictive_market_hack

Conflicts:
	Exec/stock_history.html
	Exec/transaction_history.html