promo, 1024
выа
Merge branch 'gh-pages' of https://github.com/tybys/tybys into gh-pages

Conflicts:
	landing/app.less
	landing/css/app.css