Develop

Hi Georgia,

Can you check if this pull request automatically merges. I just resolved a merge conflict in two files app/helpers/users_helper.rb and app/views/users/show.html.erb

Thanks,
Sowjanya