Create users
changed gemfile for testing
micropost creation
merge conflict