modified readme in fork
resolved conflicts
Merge pull request #1 from i1der/master

Pull request title:initiating a pull request