1
Merge branch 'master' of https://github.com/ChenGuangXing/ChenGuangXing.github.io

Conflicts:
	_posts/2014-05-08-StackEditBeta.md