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

Conflicts:
	blog/admin.py

fix