Changed back a variable name that is not supposed to be changed.
Changed call back function for error message
Merge branch 'master' of github.com:HarvardEconCS/TurkServer