shit
some stuff
fixed gitignore
Merge branch 'master' of github.com:theturrible/MusicStream