Made some changes in master
Merge branch 'merge_master' of github.com:roystgnr/testgit into merge_branch
Fix the merged program