bla
Merge branch 'master' of https://github.com/nitbix/ensemble-testing.git

Conflicts:
	src/main/Test.java
catch some exceptions