edited question in Factory
escaped html
correct Factory Girl create user
fix merge issue in factory.rb
fixed merge conflicts w/ amy
thinned out our fatty controller
Update README.rdoc
stashing changes for pull request
thinned out our fatty controller
Update README.rdoc
created migration for votes and model with polymorphic relationships
Updated user tests to make them pass:
Remove unsuccessful signup error check, because no errors are handled in the model.
Updated the path for a new successful user signup to the correct new user pass
spec/requests/user_spec.rb

Answer test corrected:
Used the user -added using factory girl- actual id to check against the answer.user_id in spec/models/answer_spec.rb
Created a new votes controller. Has two methods, answer_upvote, and answer_downvote
	new file:   app/controllers/votes_controller.rb

Created a Vote model that uses a polymorphic relationship with answer
	modified:   app/models/vote.rb

Updated links and took out your locals hash as it wasn't doing anything at all...
Added buttons for upvote and downvote.
	modified:   app/views/questions/show.html.erb

Added nested post routes for upvote and downvote

	modified:   config/routes.rb
Created an helper to select the object voted on :
app/helpers/votes_helper.rb

Created new routes for vote buttons on questions
config/routes.rb

Updated the vote controller to make only one method for every direction of vote
app/controllers/votes_controller.rb

Updated the view to integrate the buttons on question
app/views/questions/show.html.erb
  modified all actions that had polymorphic_validation method
  - polyformphic validation is handled in the form
	modified:   app/controllers/answers_controller.rb

  deleted the poloymorphic_validation action
	modified:   app/controllers/application_controller.rb

  updated answerable_id to question_id
	modified:   app/helpers/votes_helper.rb

  added attr_accessible question_id
	modified:   app/models/answer.rb

  altered form to allow it to answer an answer
	modified:   app/views/answers/_answer_form.html.erb

  added the form to answer an answer (THE VIEW STILL NEEDS TO BE UPDATED FOR POLYMORPHIC ANSWER ON ANSWER)
	modified:   app/views/questions/show.html.erb

  corrected line 6 to downvote
	modified:   config/routes.rb

  created migration to add question_id column to answer table
	new file:   db/migrate/20130606210534_add_question_column.rb
wip
wip2
Removed spec/factories/votes.rb which was a duplicate of spec/factories.rb

Updated factory to create a vote for an answer or a question
spec/factories.rb

Updated user model to include a method to check if the user already voted on a votable
app/models/user.rb

Added a method to sum the vote for a question
app/models/question.rb

Added a conditoiin on display of vite buttons
app/views/questions/show.html.erb

Added some tests on up and down votes on question
spec/models/vote_spec.rb
Added method to check if already voted and adapt count accordingly
app/controllers/votes_controller.rb

Deleted method to check if already voted
app/models/user.rb

Updated the view to remove conditionnal display
app/views/questions/show.html.erb
added answer spec
moved root_to up to the top of all of the resources