modified employee/show.html.erb and people.css
fixed conflicts
Merge branch 'master' of github.com:ardmore/website