.
Merge branch 'master' of github.com:otree-org/oTree
Merge branch 'master' of github.com:otree-org/oTree
renamed to_safe_json to safe_json
Merge pull request #25 from oTree-org/principal-agent

principal_agent game updates
safe_json
removed feedback-from-user from each game and put it into a separate app
Update views.py
principal_agent: adjust templates