* test.txt: added test file 2
Merge branch 'master' of github.com:Gilwyad/Test-DangerZone

Conflicts:
	test.txt