added support for cat command
resolved conflicts between pwd and cat branches