Merge branch 'master' into develop
Merge branch 'master' into mixture
Merge branch 'develop' into mixture
Merge branch 'develop' of github.com:ariel17/poppurri into develop
Change project name due to domain availability :(
Add psycopg2 as base requirement.
Add web configuration for Heroku deployment
Change Procfile to use gunicorn ext command.
Change local database configuration.
Change version of debug toolbar.
Merge branch 'add-admin' into develop
Merge branch 'develop' into mixture
Add mixture application definition, settings and ViM modeline.
Merge branch 'mixture' into develop
Add mixture mock.
Merge branch 'develop' into web