CSS changes
fixed merge conflict in app.html.erb.