Merge remote-tracking branch 'remotes/origin/source' into source
	modified:   2014-05-16-mei-ge-mac-os-x-ming-ling-xing-yong-hu-ying-dang-zhi-dao-de-ba-ge-zhong-duan-gong-ju.markdown
	modified:   2014-05-16-mei-ge-mac-os-x-ming-ling-xing-yong-hu-ying-dang-zhi-dao-de-ba-ge-zhong-duan-gong-ju.markdown
	modified:   2014-05-16-mei-ge-mac-os-x-ming-ling-xing-yong-hu-ying-dang-zhi-dao-de-ba-ge-zhong-duan-gong-ju.markdown
Merge branch 'source' of https://github.com/Joywii/joywii.github.com into source

Conflicts:
	source/_posts/2014-05-16-mei-ge-mac-os-x-ming-ling-xing-yong-hu-ying-dang-zhi-dao-de-ba-ge-zhong-duan-gong-ju.markdown