1
import static
Merge branch 'master' of https://github.com/heipacker/testjava.git

Conflicts:
	.classpath