new2
Merge remote-tracking branch 'origin/master'

Conflicts:
	ExamMaker/MainWindow.xaml
	ExamMaker/obj/Debug/MainWindow.g.i.cs