Hollands test seem to work
Merge branch 'master' of https://github.com/KernelCorp/genetic-test

Conflicts:
	app/models/user.rb