Merge branch 'master' of D:\projects\team1 with conflicts.
graph
Merge branch 'master' of https://github.com/yandex-shri-ekb-2014/team1 into fullWeather