#gt-119 work 40m
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/trainer_controller.rb
Merge branch 'master' of https://github.com/KernelCorp/genetic-test