delete lines
Merge remote-tracking branch 'origin/master'

Conflicts:
	my_first_doc.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	my_first_doc.txt