Friendship model is working: can add friends and display a user's friends
Merge branch 'master' of https://github.com/JuhaMikkola/fitbyfriday

Conflicts:
	config/routes.rb
	db/schema.rb