screwed up the markdown for python syntax (now it should work)
Merge branch 'master' of github.com:octaflop/django-twoscoops-project