Fixing conflicts
Merge branch 'master' of git@github.com:crespo2014/queue.git