added points before merge xeperiment
Yes

Merge branch 'test1'

Conflicts:
	123
Merge branch 'test1' into test2

Conflicts:
	123
Merge branch 'test2'

Conflicts:
	123
cleaned
Finished learning git