new file:   _vimwiki/Probability.wiki
	modified:   _vimwiki/cloudstack.wiki
	modified:   _vimwiki/cryptographyandsecurity.wiki
	modified:   _vimwiki/index.wiki
	modified:   _vimwiki/shell.wiki
	new file:   wiki/Probability.html
	modified:   wiki/cloudstack.html
	modified:   wiki/cryptographyandsecurity.html
	modified:   wiki/index.html
	modified:   wiki/shell.html
Merge branch 'master' of https://github.com/yishanhe/yishanhe.github.com

Conflicts:
	_vimwiki/index.wiki
	_vimwiki/shell.wiki
	deleted:    _drafts/2012-03-20-bookmarkdown.markdown
	deleted:    _drafts/2012-04-13-education-in-web.markdown
	deleted:    _drafts/2012-11-14-important-day.markdown
	modified:   _vimwiki/CS304.wiki
	modified:   _vimwiki/index.wiki
	modified:   wiki/CS304.html
	modified:   wiki/index.html
	modified:   ~syi/index.html
	modified:   wiki/CS304.html
Merge branch 'master' of https://github.com/yishanhe/yishanhe.github.com

Conflicts:
	_vimwiki/CS304.wiki
	_vimwiki/index.wiki
	wiki/index.html