changed merge.txt in v2
added merg2.txt
Merge branch 'master' into v2