fixed formatting error in timer display code
Merge branch 'master' of github.com:ucberkeley/moocchat
attempt to patch fixes back to master
removed unnessary start
fixed @answers to @question.answer
Complete merge