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

Conflicts:
	archlinux.wiki
	index.wiki
	mysql.wiki
	resume.wiki