BR2
Merge branch 'BR2'

Conflicts:
	src/MainTrial.scala