update
Merge branch 'master' of github.com:yihui/stat-sci-cranvas

Conflicts:
	reactive-programming.Rnw