1
Merge remote-tracking branch 'origin/master'

Conflicts:
	teamProjectHse/MainWindow.xaml
Merge branch 'master' of https://github.com/TeamProjectHSE/vorontsov-badaeva-antonova

Conflicts:
	teamProjectHse/MainWindow.xaml
	teamProjectHse/teamProjectHse.csproj