Dimitris Commit
Merge branch 'master' of github.com:pulse-than/test

Conflicts:
	test2.txt
waiting for conflict.
no message
maka the file smaller
hello
branch another
Merge branch 'than'
Merge branch 'than1'

Conflicts:
	test.txt
b111