second line
Merge branch 'master' of https://github.com/itaifrenkel/kipi2

Conflicts:
	readme.txt