Updated profile.html to have Add Friend text box and button.
Fixed merge conflict in profile.html