fix conflict
Merge remote-tracking branch 'team/master'

Conflicts:
	src/ch03/Tree.scala