update

1
Merge branch 'master' of https://github.com/Vossen-Konijnen/VKTesten2

Conflicts:
	src/vk/controller/Controller.java
	src/vk/main/Initialize.java
	src/vk/model/Model.java