commitm2
Merge branch 'b1'

Conflicts:
	src/dieterbaier/git/sandbox/Main.java