Got it working

Currently works
Merge remote-tracking branch 'origin/master'

Conflicts:
	JIX/src/jix/JIX.java