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

Conflicts:
	vote/settings.pyc
	vote/urls.pyc

fix