Merge branch 'intfrans'

Conflicts:
	src/be/vdab/Main.java
	
	Hallo iedereen