Merge
Merge branch 'master' of https://github.com/hotdogee/django-blast.git