h '''
tt
kk
just fo commit
just for commit 2
create blog model
Merge remote-tracking branch 'origin/integrate'

Conflicts:
	.pydevproject
	blog/models.py
	howshouldido/settings.pyc
	howshouldido/urls.py
	howshouldido/urls.pyc
	show_index/views.py