fizteh Kuzmichev Dmitry 394 repository first commit
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/ru/fizteh/fivt/students/Gudkov Konstantin 394/shell/ShellMain.java
	src/ru/fizteh/fivt/students/kuzmichevdima/shell/ShellMain.java
	src/ru/fizteh/fivt/students/test/shell/ShellMain.java
Merge remote-tracking branch 'upstream/master'
shell task commit. Please check email, i've sent you the document which explains why i didn't make it before deadline
 shell task commit. Please check email, i've sent you the document which explains why i didn't make it before deadline
Merge remote-tracking branch 'upstream/master'
shell second commit. Interface added, Ifs replaced with HashMap
Merge branch 'kuzmichevdima-master'
Merge branch 'master' of https://github.com/dkomanov/fizteh-java-2014