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

Conflicts:
	README.md
commit 4 from branch