lost ds_store
Some old stuff
Merge branch 'master' of https://github.com/KernelCorp/genetic-test

Conflicts:
	app/views/psych_tests/career_anchors_test/show.html.slim