Required Functionality
Merge branch 'master' of https://github.com/dustyweisner/ECE382_Lab6