My local changes
Merge branch 'master' of https://github.com/cfillier/try_git

Conflicts:
	test.txt