garbage
fix queue merge conflict
Fix my branch. Merge branch 'master' of https://github.com/bryceholcomb/event_reporter
Merge branch 'master' of https://github.com/bryceholcomb/event_reporter