gitignore
Merge remote-tracking branch 'django-blog/master'

Conflicts:
	.gitignore