fix
fixMerge branch 'master' of github.com:ikishik/taekwondo-ratmir.ru

Conflicts:
	Gemfile.lock