Merge remote-tracking branch 'remotes/origin/Microposts'

Conflicts:
app/models/user.rb
spec/models/user_spec.rb