commit
Merge branch 'master' of https://github.com/eorielle/test

Conflicts:
	test.txt