modified:   _vimwiki/shell.wiki
	modified:   wiki/shell.html
Merge branch 'master' of https://github.com/yishanhe/yishanhe.github.com