Part 3 commits
Merge branch 'master' of https://github.com/CassieMcPeek/ECE281_CE5