push branch ezoucha
Merge branch 'master' of http://github.com/xbsoft/demo into ezoucha
Merge branch 'master' of http://github.com/xbsoft/demo into ezoucha

Conflicts:
	ezoucha.txt
Merge branch 'master' of http://github.com/xbsoft/demo into ezoucha