Added README
Conflict resolved. updated README