2
Merge remote-tracking branch 'origin/master'

Conflicts:
	ExamMaker/MainWindow.xaml
	ExamMaker/bin/Debug/ExamMaker.exe
	ExamMaker/bin/Debug/ExamMaker.pdb
	ExamMaker/obj/Debug/ExamMaker.exe
	ExamMaker/obj/Debug/ExamMaker.pdb
	ExamMaker/obj/Debug/ExamMaker_MarkupCompile.cache
	ExamMaker/obj/Debug/MainWindow.g.i.cs