part 1 tutorial django
gitignore file conflict corrected