Merge branch 'source' of github.com:yoyowinwin/yoyowinwin.github.com into source

Conflicts:
	source/_posts/2013-07-23-pow-x-n.markdown
Merge branch 'source' of github.com:yoyowinwin/yoyowinwin.github.com into source