Did so much stuff
deleted unneeded game.rb file
fixed minor conflicts