commit branch1 test12
test123 webeditor
merge
commit
commsynch
Merge branch 'branch1' of https://github.com/leha2323/gita into branch1

Conflicts:
	test.txt
On branch branch1
modified:   test.txt
Merge branch 'branch1'