new Shlomy
Merge branch 'master' of https://github.com/shaloba/Shlomy

Conflicts:
	A