asd
Merge branch 'master' of https://github.com/xakepa/StoreManagement

Conflicts:
	MelonStoreApp/MelonStoreApp/MainWindow.xaml