edit README to conflict
edit README with Pink Floyd allusion
merged two versions of README