Test 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	test.txt.txt.txt.txt
Merge branch 'master' of https://github.com/Blancdr/DomOpen

Conflicts:
	test.txt.txt.txt.txt