new document
Merge branch 'develop' into jason
comment line and database
database diagram changed
write about what you changed
Merge commit '0028a37201adaff2b80dbcbfc04c2afff41c9a1b' into DbChanges

Conflicts:
	CarpoolSystem.suo
	CarpoolSystem/App_Data/MainDb.mdf
	CarpoolSystem/App_Data/MainDb_log.LDF
	CarpoolSystem/bin/CarpoolSystem.dll
	CarpoolSystem/bin/CarpoolSystem.pdb
	CarpoolSystem/obj/Debug/CarpoolSystem.csproj.FileListAbsolute.txt
	CarpoolSystem/obj/Debug/CarpoolSystem.csprojResolveAssemblyReference.cache
	CarpoolSystem/obj/Debug/CarpoolSystem.dll
	CarpoolSystem/obj/Debug/CarpoolSystem.pdb
	CarpoolSystem/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CarpoolSystem/obj/Debug/TempPE/MainDbModel.Designer.cs.dll