no tabs,home->dir,add{} after if,catchs is not empty now.
.
Merge branch 'master' of https://github.com/look-in-a/fizteh-java-2014

Conflicts:
	src/ru/fizteh/fivt/students/test/shell/ShellMain.java