More cleanup
Work in progress
Progress
Merge remote-tracking branch 'origin/master'

* origin/master:
  main
  apply plugin2
  apply plugin idea

Conflicts:
	src/main/java/nl/hsleiden/iopr3/Main.java