Updated README.md
Set up a basic build with CMake
Merge conflict in README.md