added 4th line
Merge remote-tracking branch 'origin/master'

Conflicts:
	test new doc.txt
merge again
Revert "merge again"

This reverts commit 2e4d3ca978eea193e675c75ad61485a3f15066e2.
sync to master