First set of changes to branch
Second set of changes to branch
Merge branch 'merge_master' of github.com:roystgnr/testgit into merge_branch
Fix the merged program
Merge pull request #2 from roystgnr/merge_branch

Merge merge_branch