Removed conflict tags from the readme file
Merge pull request #2 from shyamsalimkumar/master

Removed conflict tags from the readme file