add timer, correct/wrong answer, poitns
timer
fix env merge conflicts