remove

remove some lines
Merge remote-tracking branch 'origin/master'

Conflicts:
	testnewfile.txt