update from mpd
Merge branch 'source' of https://github.com/korbenzhang/korbenzhang.github.com into source

Conflicts:
	source/_posts/2013-02-28-usage-of-github.markdown
some update