initial comit
nMerge branch 'master' of https://github.com/carlad/django_sample_app