created Rakefile
created users table, migration file
added Gemfile, spec_helper.rb, user_spec.rb
removed duplicated, moved created directories
resolved conflicts
Merge pull request #2 from gopher-snakes-2013/user-has-name

User has name