fix readme
Merge commit 'refs/top-bases/t/coreseek' into t/coreseek
fix merge in .gitignore
fix merge ignore