edit answers controller
Fix Merge Conflict
Fix merge conflict
Merge branch 'master' of https://github.com/kthffmn/twidder2