testing branch
Merge branch 'master' into issue1

testing a merge branch
Merge pull request #2 from darkner/issue1

Issue1