conflict-resolution

<<<<<<< HEAD

This is subheading created locally

All of this content added to the readme file has been added from my local Git repository.

e85738a2c12bc9d830447c08a14b497e0036d043

Name		Name	Last commit message	Last commit date
Latest commit History 4 Commits
README.md		README.md