new file:   _wiki_source/SOMENOTE.wiki
Merge branch 'master' of https://github.com/yishanhe/yishanhe.github.com

Conflicts:
	_wiki_source/index.wiki
	_wiki_source/linux.wiki
	wiki/linux.html