merge conflicts
Merge branch 'master' of github.com:truewalrus/personality-interest-test-plugin