amend
Merge branch 'first_milestone' of github.com:kmdevel/django-base-template into first_milestone