Fixed mah stuff
Merge branch 'master' of https://github.com/DizzyThermal/ECE-489-Project.git