setup
Merge branch 'master' of https://github.com/Austinbolinger/ECE382Lab6
Merge branch 'master' of https://github.com/Austinbolinger/ECE382Lab6