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

Conflicts:
	scala/wiki_html/Part.02.html
Merge branch 'master' of github.com:Jade-Shan/study

Conflicts:
	scala/wiki_html/Part.02.html