Merge branch 'smith1302' of https://github.com/lgutlohn/SoftwareEngineeringProject into smith1302
Merge branch 'master' of https://github.com/lgutlohn/SoftwareEngineeringProject