merged master Merge branch 'master' of https://github.com/pizzimenti/gamified-queue into business_logic
merged master
Merge branch 'master' of https://github.com/pizzimenti/gamified-queue into business_logic

pizzimenti/gamified-queue,pizzimenti/gamified-queue