头像地址加密
Merge branch 'master' of https://github.com/crabyh/htdocs

Conflicts:
	user_info.php