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

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

con