testing branching

added some random comments
delete some comment
Merge branch 'branch1'