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