under git
Merge branch 'master' of https://github.com/deafol/javatests

Conflicts:
	build.gradle
	settings.gradle

	new file:   .gitignore
	modified:   build.gradle
	modified:   settings.gradle
	new file:   src/main/java/nl/vinyamar/nio/TestPath.java
	new file:   src/main/java/nl/vinyamar/parallel/External.java
	new file:   src/main/java/nl/vinyamar/parallel/ObservableTester.groovy
	new file:   src/main/java/nl/vinyamar/parallel/Tester.java
	new file:   src/main/java/nl/vinyamar/statics/AStaticClass.java
	new file:   src/main/java/nl/vinyamar/statics/AStaticSubClass.java
	deleted:    build/classes/main/nl/vinyamar/nio/TestPath.class
	deleted:    build/classes/main/nl/vinyamar/parallel/External.class
	deleted:    build/classes/main/nl/vinyamar/parallel/Tester.class
	deleted:    build/classes/main/nl/vinyamar/statics/AStaticClass.class
	deleted:    build/classes/main/nl/vinyamar/statics/AStaticSubClass.class
	new file:   src/nl/vinyamar/jks/testJKS.java
added spring