add
Merge branch 'master' of https://github.com/sunguowei/sunguowei.github.io

Conflicts:
	_posts/env-config/2014-07-13-env-config-jdk.md