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

Conflicts:
	_posts/2014-01-14-java_coding_style.md