фывфыввфы
Merge remote-tracking branch 'origin/master'

Conflicts:
	Properties/Settings.Designer.cs
	app.config