After testing Basic Functionality and B Functionality
Merge branch 'master' of https://github.com/EricaLewandowski/ECE382-Lab1