got rid of <<<<HEAD randomness
Merge branch 'master' of github.com:stuycs-ml7-projects/BZ-SD
Merge pull request #14 from stuycs-ml7-projects/Batya

changed the port
trying to clean up the alelerts
if you don't get an address because you're in the middle of the ocean or something it gives rickrolling now and no alert