Fixed README
Fixed README - for real now
resolved conflict