added friendship model in prep to create a self referencing association, added search bar for User/index
add a friend link...now working on remove a friend
styling added to Users/index
acces_token.yaml change search for friendships fixed my new model friendship<User
Merge branch 'master' of https://github.com/hayduke19us/compromise_music

Conflicts:
	app/models/user.rb
	config/routes.rb
	db/schema.rb