friend part
friend part
Merge branch 'master' of https://github.com/cosc617g4/project

Conflicts:
	app/models/user.rb
	config/routes.rb
	db/schema.rb