some fixes are made
Merge branch 'master' of https://github.com/KernelCorp/genetic-test

Conflicts:
	app/assets/javascripts/application.js