testing merge
Merge branch 'master' of https://github.com/vovakatz/PhotoOrganizer

Conflicts:
	MainWindow.xaml.cs