merge
fixed online users
Merge branch 'master' of https://github.com/jtsanch/music_app
stuf
fixedonline