Added csv reader
Fixed merge conflict