Fixed merge conflicts, deleted add answer button
Merge pull request #101 from lamorie/master

Fixed merge conflicts, deleted add answer button