Modify the model to validate Friendship
Merge branch 'master' of github.com:Kernald/RoBy

Conflicts:
	db/schema.rb