update note
Merge remote-tracking branch 'origin/master'

Conflicts:
	_content/_drafts/temp/scala/fpinscala.txt
Merge branch 'master' of https://github.com/jasonqu/reading-notes.git