commit
Merge remote-tracking branch 'remotes/origin/master' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'remotes/origin/master' into gh-pages

Conflicts:
	index.html
commit
chinaMap
Merge remote-tracking branch 'origin/gh-pages'
'index'
index
octopress
Merge branch 'master' of github.com:feeloc/jframe
octopress