Created three new files followd with "git add"; adding "aaa" to file1, file2 and file3, then "git checkout -- file1" and at last "git commit"
Edited file1 in experimnetal branch
Master branch
Merge branch 'experimental'

Conflicts:
	file1
Hlaska
Auto with hlaska on "file1"
Conflicts:
	file1
sugar added
sugar added also on master
tsg project2
edited file4
Merge remote-tracking branch 'dtts/master'
file7 created, file6 modified
file8 to exper
edited file8
edited file8
Edited file9 to master branch
Edited file9
Edited file 1 with two lines
renamed file1->file1_a
renamed file1_a->file1_b