finished up stuff
Merge branch 'master' of https://github.com/caitlinhickey/predictive_market_hack