nother commit
Merge branch 'master' of https://github.com/itaifrenkel/kipi2

Conflicts:
	readme.txt
Merge pull request #1 from erezgiga/master

please merge :)