Merge from windows
Merge branch 'master' of https://github.com/yiqun/yiqun.github.io

Conflicts:
	index.html
	wiki/index.wiki
Add: how to see windows memory maxium