Merge branch 'master' into cleanup

.rspec

@@ -1,2 +1 @@
 --color
---require spec_helper

spec/features/votes_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-feature 'Votes', :focus do
+feature 'Votes' do
 
   background do
     @manuela = create(:user)

spec/models/user_spec.rb

@@ -1,5 +1,4 @@
 require 'rails_helper'
 
-RSpec.describe User, type: :model do
+describe User do
-  pending "add some examples to (or delete) #{__FILE__}"
 end