12/3

some error checking
Fixes
Merge remote-tracking branch 'origin/Matt22'

Conflicts:
	CIS411_Kris/db.mdf
	CIS411_Kris/db_log.ldf