primer commit
Merge branch 'master' of github.com:mopitz199/base_django