Added FactoryGirl: defined factories for user, question and answer and implemented some of it in user and question.html.erb files.
fixed merge conflict in spec_heler.rb to add FactoryGirl shortcuts