Minor changes
Merge branch 'master' of https://github.com/andreascmj/command-line-test

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