Clean up project 3 code
Merge branch 'devBranch' of https://github.com/cbrownfield2/446 into devBranch