test branch file

just to test.
new changes
renamed
Merge pull request #2 from aleq/2_branch

2 branch