Initial commit
Update .gitignore
Added readme
Fixed conflict