finish buddy allot
Merge branch 'master' of https://github.com/freedombird9/CMPS111-project