some notes
some notes
Merge branch 'master' of github.com:zhwei/zhwei.github.com

Conflicts:
	a/index.markdown