All Done. I hope...
I like GitGui!!!
Merge branch 'master' of http://github.com/kirillne/OSiSPLab7

Conflicts:
	DriverExample/objchk_wxp_x86/BuildLog.htm
	DriverExample/objchk_wxp_x86/i386/DriverExample.sys
	DriverExample/objchk_wxp_x86/i386/_objects.mac
	UserModeApp/Debug/BuildLog.htm
	UserModeApp/Debug/UserModeApp.obj
	UserModeApp/Debug/UserModeApp.pch
	UserModeApp/Debug/mt.dep
	UserModeApp/Debug/stdafx.obj
	UserModeApp/Debug/vc90.idb
	UserModeApp/Debug/vc90.pdb
	UserModeApp/UserModeApp.cpp