added AnswerButton class resolved #20
fixed merge conflicts