sync
sync
sync
css changes to people page
conflict solved