a
Merge branch 'master' of https://github.com/pelolep/CIS411

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