Changed how program is started. Possibly breaking everything :)
Merge remote-tracking branch 'origin/master'

Conflicts:
	JCATInteractiveMode/src/com/company/JCATInteractiveMode.java