Adding relevant comments to diretory.rb
Merge branch 'branch1'

Conflicts:
	directory.rb