fix le race condition
conflict fix0rs
Merge branch 'master' of github.com:/qhas/qhasd-rails