blah
Merge branch 'master' of https://github.com/applekey/Ece496
found a few bugs