add admin panel and stuff
Merge branch 'master' of https://github.com/cjwinchester/django-test