erd gem installed
Merge branch 'master' into display-queue
player working?
player working
Merge pull request #77 from zstayman/display-queue

Display queue