modified:   wiki/README.md
	renamed:    wiki/salt/intro.wiki -> wiki/Salt.wiki
	renamed:    wiki/shell_command_line_shortcut.md -> wiki/Shell.wiki
	renamed:    wiki/sublime/package_console.wiki -> wiki/Sublime.wiki
	new file:   wiki/html_css/index.wiki
	modified:   wiki/index.wiki
	new file:   wiki/javascript/index.wiki
	modified:   wiki/javascript/mock.wiki
	new file:   wiki/javascript/pretty.js.wiki
	new file:   wiki/lua/index.wiki
	new file:   wiki/nginx/index.wiki
	new file:   wiki/ngx_lua/index.wiki
	renamed:    wiki/perl1line.txt -> wiki/perl/perl1line.txt
	new file:   wiki/python/index.wiki
	deleted:    wiki/salt/install.wiki
	new file:   wiki/scrum tools.wiki
	deleted:    wiki/scrum_tools.md
	new file:   wiki/sshfs.wiki
	modified:   wiki/templates/default.html
	new file:   wiki/varnish/index.wiki
	new file:   wiki/vim/index.wiki
	deleted:    wiki/vim/mac_vim.wiki
	deleted:    wiki/vim/script.wiki
	renamed:    wiki/virtualbox nat -> wiki/virtualbox/virtualbox nat
	modified:   "wiki/\345\267\245\347\250\213\345\270\210\347\232\204\351\235\236\346\212\200\346\234\257\347\264\240\345\205\273.wiki"
	new file:   "wiki/\350\277\220\347\273\264\345\267\245\347\250\213\345\270\210\347\232\204\345\267\245\345\205\267\351\223\276.wiki"
	renamed:    wiki_html/salt/intro.html -> wiki_html/Salt.html
	new file:   wiki_html/Shell.html
	renamed:    wiki_html/sublime/package_console.html -> wiki_html/Sublime.html
	modified:   wiki_html/css/bootstrap.min.css
	new file:   wiki_html/css/prettify.css
	new file:   wiki_html/html_css/index.html
	new file:   wiki_html/img/glyphicons-halflings.png
	modified:   wiki_html/index.html
	new file:   wiki_html/javascript/index.html
	modified:   wiki_html/javascript/mock.html
	new file:   wiki_html/javascript/pretty.js.html
	modified:   wiki_html/javascript/trainningByWenson.html
	new file:   wiki_html/js/prettify.js
	new file:   wiki_html/lua/index.html
	renamed:    wiki_html/salt/install.html -> wiki_html/nginx/index.html
	new file:   wiki_html/ngx_lua/index.html
	modified:   wiki_html/puppet/puppet.html
	new file:   wiki_html/python/index.html
	new file:   wiki_html/scrum tools.html
	new file:   wiki_html/sshfs.html
	new file:   wiki_html/varnish/index.html
	new file:   wiki_html/vim/index.html
	deleted:    wiki_html/vim/mac_vim.html
	deleted:    wiki_html/vim/script.html
	modified:   "wiki_html/\345\267\245\347\250\213\345\270\210\347\232\204\351\235\236\346\212\200\346\234\257\347\264\240\345\205\273.html"
	new file:   "wiki_html/\350\277\220\347\273\264\345\267\245\347\250\213\345\270\210\347\232\204\345\267\245\345\205\267\351\223\276.html"