Friendships
Merge remote-tracking branch 'origin/w/bootstrap' into w/bootstrap

Conflicts:
	.idea/.generators
	.idea/workspace.xml
	Gemfile
	Gemfile.lock
	app/views/devise/registrations/show.html.erb
	app/views/layouts/application.html.erb
	config/routes.rb
	db/schema.rb
Friends