test
Merge branch 'gh-pages' of github.com:shelldonegao/blog into gh-pages

Conflicts:
	_posts/2014-05-10-test-file.md