got rid of <<<<HEAD randomness
Merge branch 'master' of github.com:stuycs-ml7-projects/BZ-SD