First commit
Fix Readme.md conflict
Fix conflicts