desecribe
threads
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/physicsevolve/MaxOnes.java
	src/physicsevolve/inter.params
Merge branch 'master' of https://github.com/brendan-poole/jbullet-ecj

Conflicts:
	src/physicsevolve/inter.params
Wildcard.