Add user following 2nd try
Merge branch 'following-users-2'

Conflicts:
	app/controllers/relationships_controller.rb
	app/models/micropost.rb
	app/models/relationship.rb
	app/models/user.rb
	app/views/relationships/create.js.erb
	app/views/relationships/destroy.js.erb
	app/views/shared/_stats.html.erb
	app/views/users/_follow.html.erb
	app/views/users/_follow_form.html.erb
	app/views/users/_unfollow.html.erb
	app/views/users/show.html.erb
	config/routes.rb
	db/schema.rb
	lib/tasks/sample_data.rake
missing '_'
Merge branch 'following-users'