Merge branch 'master' of https://github.com/zuojie/zuojie.github.com

Conflicts:
	daily/male/male2.html
..