i need to commit more regularly :)
Merge branch 'master' of github.com:carthagecollege/django-djaludir