Layout

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

Conflicts:
	src/vk/controller/Controller.java