Fix
* fix: Bring back test setup ([`b2e8bd2`](https://github.com/ocadotechnology/codeforlife-portal/commit/b2e8bd2f547cb6231cd0f9f5e9110405f4cd2c3f))
* fix: Update setup.py and pipfile ([`c5931a8`](https://github.com/ocadotechnology/codeforlife-portal/commit/c5931a896b0d7cf050313c54becedac0dc213608))
* fix: Merge in master ([`b5019b4`](https://github.com/ocadotechnology/codeforlife-portal/commit/b5019b40282d6c2fdb7b0310573c6cea60530d5c))
Unknown
* Merge pull request 1322 from ocadotechnology/django_2_upgrade
feat: Django 2 upgrade ([`df143ae`](https://github.com/ocadotechnology/codeforlife-portal/commit/df143ae18c9c17fd857e455358a53a0682708892))