lemon_market: use random period payoff
Merge branch 'master' into lemon-market
lemon_market: move text to templates
Dictator game updates
prisoner: instructions table
asset market: more changes
.
Merge pull request #16 from oTree-org/prisoner

prisoner: instructions table
Merge pull request #15 from oTree-org/dictator

Dictator game updates
Merge branch 'master' of https://github.com/oTree-org/oTree
Update models.py

change links
Merge pull request #14 from oTree-org/lemon-market

lemon_market: use random period payoff
Merge branch 'master' of github.com:oTree-org/oTree
beauty: added total_q to question pages and changed widget to choice removing combo