Refactored Friendship associations
Merge branch 'refactor_friendships'

Conflicts:
	app/views/workouts/_friends.html.erb
	app/views/workouts/index.html.erb