modif for master #1
Merge pull request #1 from nswarte/dev1

add a nice new file
Merge branch 'dev1'

Conflicts:
	test.txt
Merge branch 'master' into dev1

Conflicts:
	test.txt