updated the comments on all files
resolved readme merge conflict