created tests for answers
added migrations for answers
added answer model and updated question model assoc w/ answer
added answer controller and new view
modifed questions view to incorporate answers
fixed merge conflicts
added current_user helper
included restful resources for answers
moved answer form onto question page

the form to create a new answer is on the page for that particular question
updated answer/question controllers accordingly