add cookie
Merge branch 'master' of https://github.com/IdiotBoy/DjangoLearn

Conflicts:
	DjangoLearn/settings.py
	DjangoLearn/urls.py
	blog/models.py
	blog/views.py