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

Conflicts:
	test.txt