More friendship work
Merge branch 'master' of github.com:nboneh/final_app
Merge branch 'master' of github.com:nboneh/final_app

Conflicts:
	app/controllers/friendships_controller.rb
	app/models/friendship.rb
	app/views/friendships/find.html.erb