Update models.py

change description
Update models.py

typo
Merge branch 'master' into trust-game

Conflicts:
	trust/models.py
trust game update
Update models.py

typo
Update Feedback.html

bold
Update Send.html

capitalize
Update SendBack.html

capitalize
Update Results.html

bold
Merge pull request #5 from oTree-org/trust-game

Trust game
Merge pull request #6 from oTree-org/bargaining

Bargaining
Update models.py

change description
Update models.py

change description
update bargaining instructions