Merge pull request #4 from lgutlohn/smith1302

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