testtest
Merge branch 'master' into testbranch
bin commit
branch 1
branch2
Merge branch 'testbranch'

Conflicts:
	bin/TestSpringLayout.class
	src/TestSpringLayout.java