Updated README.md file.
Solved conflicts and added missing files.