did soe stuff
Merge branch 'master' of https://github.com/dlau034/teachbeats
Almost done. Just need to do some more fak fakes