initial local commit
Comnflict resolution on	README.md