finished addAnswer and addChoice buttons. they should work fine.
merging