Merge pull request #19 from vivekmgeorge/master

Couple small changes before going to bed
save
fixed merge conflicts in routes and on question show view
Merge pull request #20 from dylanerichards/master

fix merge conflicts. remove 2 unnecessary @question.body from show view
merging all changes