About done.
Merge remote-tracking branch 'origin/master'

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