update
Merge branch 'master' of github.com:Jade-Shan/study

Conflicts:
	notes/wiki/scala.Part.02.wiki
	notes/wiki_html/scala.Part.02.html