changed app/assets/stylesheets/about.css
app/assets/stylesheets/people.css
app/views/about/index.html.erb
fixed conflicts