Add some notes to the README
git merge oddities