Added files
Fixed conflict in readme.md