commit 5 from branch
commit 6 from branch
commit 5 from branch
commit 6 from branch
Merge branch 'test_branch' of https://github.com/jfdesgagne/git_test into test_branch