Updated some typos and personal settings I had
Fixing README.md conflict