Merge pull request #12 from stuycs-ml7-projects/zbranch

Zbranch minor improvements

All good
now we have current location and it actually gives a song for it too
Merge pull request #13 from stuycs-ml7-projects/Batya

Batya
got rid of <<<<HEAD randomness
Merge branch 'master' of github.com:stuycs-ml7-projects/BZ-SD
changed the port
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
made the next and prev buttons work better
fixed merge
added commas to the address that goes on the page.
now you can see the number of songs in the playlist.
if it rickrolls it makes sure there's only 1 song in the playlist
now if you click on the marker it'll find the address or the place depending on which was chosen
Merge pull request #15 from stuycs-ml7-projects/Batya

Batya
made the center more zoomed on start-up
fixed the merge