reconciled some hit tracking code
Merge branch 'master' of github.com:HarvardEconCS/TurkServer

merge alice's frontend changes