add edit answer functionality
Merge branch 'answers'