test
Merge branch 'newbranch15' of https://github.com/cmitz/gitworkshop into newbranch15

Conflicts:
	BranchTest.java