add test2.txt
edit test.txt
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	Test.txt