added two dir
test edit
my preparechanges
Merge branch 'master' of d:/s7tmp-repo