daily
Merge branch 'master' of github.com:gaohaoliang/wiki

Conflicts:
	mysql.wiki
	vim.wiki

fix conflict