First commit
Added readme
Fixed merge conflict