some game logic and routes
fixed merge conflict index.rb