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