Merge pull request #20 from brain-murphy/elizabeth

Elizabeth
merge changes
Merge pull request #21 from brain-murphy/brian

merge changes
added answer list item
began working out QuestionActivity. Made Answer immutable.
Merge pull request #22 from brain-murphy/brian

began working out QuestionActivity. Made Answer immutable.
fixed merge issues