Added readme file
Updating
Resolving merge conflict