kufteta added
Merge branch 'master' of https://github.com/kgerov/SVN-test

Conflicts:
	jj.txt