Environment setup
Readme.md format
fixing merge errors