Added README file and added 2 people to example.txt
Fixed merge conflict
Merge pull request #1 from khushkaran/development

Added README file and added 2 people to example.txt