better stream logic, fixed stream template
better song logic
small changes
Merge pull request #3 from nramin/stream

Stream