Implementing answerTime
Finish implementing answerTime
Merge branch 'master' into develop