Merging

Merging with removal of avatar.url line of code in show.html.erb