first commit
added user.rb game.rb
third commit
first commit
[MERGE]