added styling
resolving merge conflists in app.html.erb and games_controller