Merge pull request #3 from kbasma/katia_trying_to_fix_shit

Katia trying to fix shit
creates the ability to answer each individual question
adds "answer" button to the question#show view (only if user is logged in)
creates necessary actions in answers_controller and views
Merge pull request #4 from kbasma/answering_questions

creates the ability to answer each individual question
Merge branch 'master' into katia_trying_to_fix_shit

Conflicts:
	app/controllers/questions_controller.rb
	app/views/questions/show.html.erb