шогрнпеакв
Merge remote-tracking branch 'origin/master'

Conflicts:
	Storage/Form1.Designer.cs
	Storage/Items.cs