added README
deleted oldREADME
added README
Conflict README