game.rb almost finished. 3 classes running without errors.
Fix merge errors