variant 1
merges
Merge branch 'variant.1'

Conflicts:
	newdoc.txt

 merged with variant.1
Merge branch 'master' of https://github.com/gvelim/MyDemoRepo

Conflicts:
	newdoc.txt

fixed conflict