made v1 bugfix
Update dir1.txt
Merge remote-tracking branch 'origin/v1'

Conflicts:
	dir1.txt