Bar-prime
Bar-goyle
Merge branch 'test-prime'

Conflicts:
	Bar.java