Initial commit
Added files
fix merge conflict in readme