added answer spec
moved root_to up to the top of all of the resources
Rsolve merged conflict in user.rb model
Resolve conflict, preserved master version for vote controller
Added test for answer vote, moved the file votes_spec.rb to features