user may answer question
answer controller merge conflict fix
answer view and controller
Merge branch 'master' of https://github.com/purple-martins-2013/snack-overflow into answers-controller
Merge pull request #7 from purple-martins-2013/answers-controller

Answers controller