Merge pull request #3 from n0ahz/B1

B1
Merge pull request #4 from n0ahz/B1

Deleted a line
Testing SameName file conflict 2

@master
Resolving Conflict of SameName

Manual Chk of file with Same Names
From pc testing GIT
Merge branch 'master' into B1

Conflicts:
	test.txt