added methods to questions and result
fixed conflicts in questions show
Merge pull request #14 from sebarmano/master

Solved conflicts in questions show