resolved conflicts between pwd and cat branches
fixed somme issues in README.txt