bugfix42 added
changes to 42
changes made to my.txt
more changes done on my1.txt
more changes done on 42
Merge branch 'bugfix42'