modify style
Merge branch 'gh-pages' of https://github.com/SanjayZhang/jekyll_blog into gh-pages

Conflicts:
	_posts/2014-09-29-subpackage-dex-&&-use-proguard.markdown
modify style