test conflicts
Merge branch 'master' of https://github.com/i3da/Test-How-To-Use-Github

Conflicts:
	newdoc1.txt