not sure...
Merge branch 'master' of https://github.com/okaapi/Coaching95030

Conflicts:
	app/mailers/contact_notifier.rb