Folder description

Implemented the -(NSString*)description method for the Folder class.
Conflict resolution

One line for a NSLog...