about us section, headshots layout
resolve merge conflict