Changed list of songs to dictionary (filename, song)
Do not write player status to output stream when 'next' is called, it is being ignored anyway
Merge branch 'master' into react