WIP --Changing friendship confirmation
Merge branch 'master' of github.com:gSchool/g2-social-network

Conflicts:
	app/views/users/index.html.erb
	db/schema.rb
	spec/features/users_index_spec.rb
[#71356442] users must now confirm friends before they are added

Signed-off-by: Nathanael Burt <nathanael.burt@gmail.com>