fix conflict
Merge branch 'master' of github.com:lalpert/gradsearch-scala