Added working output to console
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/company/CommandWindow.java
Merge and such
Merge remote-tracking branch 'origin/master'