merge with 'heroku' sic
Merge branch 'master' of github.com:yandex-shri-ekb-2014/team4
Merge branch 'master' of github.com:yandex-shri-ekb-2014/team4
Merge pull request #91 from gridsane/master

Мерж из хероку