Filter
Merge branch 'master' of github.com:HackathonRome/speedy-gift

Conflicts:
	app/models/friend.rb