new code for module1
hello bugfix1
Merge branch 'bugfix1' into module1
new mod1
fixed hello.txt conflicts