edit_gem_routes
Merge branch 'master' of https://github.com/yoolkTrainee/yoolk_school_app

Conflicts:
	Gemfile
	config/routes.rb
	db/schema.rb
My_Task