added answer list item
fixed merge issues
Merge pull request #23 from brain-murphy/elizabeth

Elizabeth