fix
fix
Merge branch 'master' of https://github.com/tuhao/homepage

font merge
fix
Merge branch 'master' of https://github.com/tuhao/homepage

Conflicts:
	blog/templatetags/font.pyc
	blog/views.pyc
	vote/settings.pyc

fix
font fix
font red
Merge branch 'master' of http://github.com/tuhao/homepage

Conflicts:
	blog/views.py
	blog/views.pyc
	vote/settings.pyc

con
font fix
font fix
fix
fix
Merge branch 'master' of http://github.com/tuhao/homepage

Conflicts:
	vote/settings.pyc
	vote/templates/blog_search.html

fix
fix
fix
fix
Merge branch 'master' of https://github.com/tuhao/homepage

merge
rebots.txt
Merge branch 'master' of https://github.com/tuhao/homepage

Conflicts:
	vote/urls.pyc

fix
fix