added bitters
Merge branch 'master' of github.com:joriskoris/django-template