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

Conflicts:
	blog/admin.pyc
	vote/urls.pyc
Merge branch 'master' of https://github.com/tuhao/homepage

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

Conflicts:
	blog/admin.pyc
	vote/settings.py
	vote/urls.pyc
Merge branch 'master' of https://github.com/tuhao/homepage
merge
fix
django_markdown
markdown
markdown
note_add
login fix
markup