Feature: capybara still does not work as expected, but tests seem to work(without test always may be issues)
Merge branch 'master' of https://github.com/KernelCorp/genetic-test

Conflicts:
	app/views/psych_test/index.html.haml
	app/views/psych_test/show_hollands_test.html.haml
	config/routes.rb