Some more citizen work
Merge branch 'master' of https://github.com/RadioLemon/james_loves_brocolli