Merge branch 'master' into zbranch
now the song info is in the form title by artist and will only display if there is a song
toggle added, top bar
moved search bar to top
styling stuff
textbox search bar done
I've done things, including layout
main design
added toggle switch css file
fixed the merge
Merge pull request #16 from stuycs-ml7-projects/zbranch

Zbranch main layout and design!
changed stuff in map.js?
this is why you don't name two html id's the same thing.  so the address works again.
buttons look cool, I may have messed up other stuff
forced the merge
Merge pull request #17 from stuycs-ml7-projects/zbranch

More styles!

all nice and merged!