Added/modified readme file
Oh my ...! conflict in Git