added gravatar images on site
fixed merge conflicts