update
Merge branch 'master' of https://github.com/ningg/ningg.github.com

Conflicts:
	_posts/blog/2014-11-01-kafka-dev-env-with-eclipse.md