Yolo
Merge branch 'master' of https://github.com/vinid223/ManagerPro

Conflicts:
	ManagerPro/ManagerPro/MainWindow.xaml.cs