teaching about merge conflicts
Merge pull request #13 from reneedv/master

teaching about merge conflicts