Initial README
initial commit
Conflict fixed