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

Conflicts:
	README.md