Not sure I know what I am doing!
Merge branch 'master' of https://github.com/okaapi/Coaching95030

Conflicts:
	Gemfile.lock