Forgot to reset a few things
Merge branch 'master' of https://github.com/trevorjones/ECE457P