added users
Resolve merge conflicts
Updated user.rake
Updated twitter.rb
Db migration 👌