derjis' syka

k,,k
Merge branch 'master' of https://github.com/ElGamzoGamingStudio/DB-project

Conflicts:
	PathToSuccess/PathToSuccess/MainWindow.xaml