implemented game_controller.rb
changed filename
fixed conflict
fixed conflict
implemented game-controller
Merge branch 'master' into clayka