Fixed merged conflict
teaching git
Merge pull request #1 from Folashade/nishita

Fixed merged conflict
Oops
Fixed merge conflict in README.md