c12 old
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ch12traits/ch12.sc