change color
Merge branch 'addPeopleIcon' into testing