Initial commit
Fixed merge conflict with Readme file