resolve from bulletins working
Merge branch 'master' of https://github.com/allevitan/olinbartering