test on branch 1
added second test file to branch1
Merge pull request #1 from cbalea/branch1

branch1 merged into master