shell error correction
test merge

Conflicts:
	src/ru/fizteh/fivt/students/vorotilov/shell/ConsoleInput.java
	src/ru/fizteh/fivt/students/vorotilov/shell/InteractiveCommands.java