added photo field to questions table using carrierwave
resolved merge conflicts in answer.rb"