unfinished changes
Merge branch 'master' of https://github.com/StevenGerdes/ECE421-project-4