collected static files
Merge branch 'master' of https://github.com/mrcrgl/django-marclab
cleaned up