LOGIN
Merge branch 'master' of https://github.com/Zannaa/OOAD

Conflicts:
	DejaView/DejaView.csproj
	DejaView/MainWindow.xaml
	DejaView/MainWindow.xaml.cs