commit second change in the master after demo1 created
Merge branch 'master' into demo1

Conflicts:
	test.txt
commit third change in the master after demo1 created
Merge branch 'master' into demo1

Conflicts:
	test.txt
commit forth change in the master after demo1 created
Merge branch 'master' into demo1