manual backup
Merge branch 'master' of github.com:erelsgl/erel-sites

Conflicts:
	tnk1/ktuv/eyov/yv-28-12.html