обновил
Merge branch 'master' of https://github.com/web-studio/h

Conflicts:
	public_html/images/promo/125x125.png
	public_html/images/promo/240x400.png
	public_html/images/promo/468x70.png