fix conflict

Conflicts:
	.gitignore
Merge pull request #2 from nhathv/feature/django

Merged pull request #2 Create Django project
Merge pull request #3 from nhathv/feature/class-basedview

Merged pull request #3  Guestbook django class-baseview
Merge pull request #4 from nhathv/feature/model-method

Merged pull request #4 Django 2.3 Guestbook model-method
Merge pull request #5 from nhathv/feature/formview

Merged pull request #5 Feature/formview
Merge pull request #6 from nhathv/feature/sendmail

Merged pull request #6 Guestbook Sendmail
Merge pull request #7 from nhathv/feature/sendmail

Merge pull request #7, Fix bug: can not send mail
Revert "Fix bug: can not send mail"
Merge pull request #8 from phucnpm/revert-7-feature/sendmail

Revert "Fix bug: can not send mail"
Revert "2.5 Guestbook Sendmail"
Merge pull request #9 from phucnpm/revert-6-feature/sendmail

Revert "2.5 Guestbook Sendmail"
fix conflict
fix conflict