text
Merge branch 'master' of github.com:juxuechen/juxuechen.github.io

Conflicts:
	_posts/2013-06-03-Command-Pattern.textile