added user gravatar image to current_user info hash, application.html.erb
resolved merge conflicts, fixed User login gravatar image