Making things current so I can pull
Merge branch 'master' of https://github.com/cmdubie/LCCCFacultyEvaluationProgram

Conflicts:
	App_Data/evaluation.mdf
	App_Data/evaluation_log.ldf