commit 2
modified 2.txt
added 4.txt
Merge branch 'BUG/3' into BUG/2