Caret fix. Output fix.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/console/Console.java