Merge branch 'MrShoco-master'
Merge pull request #40 from kirivasile/master

Васильев Кирилл, 395 группа. Task 1: Shell
Merge pull request #41 from Keksozavr/master

Хисматуллин Тимур, 394, Calculator
Merge branch 'shell' of https://github.com/Oktosha/fizteh-java-2014 into Oktosha-shell

Conflicts:
	build.xml
	src/ru/fizteh/fivt/students/Gudkov Konstantin 394/shell/ShellMain.java
Merge branch 'Oktosha-shell'
Merge branch 'master' of https://github.com/dkomanov/fizteh-java-2014
New changes
FileMap fixed branch
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
Fixed, В задание не было указано, что в таком случае его надо создавать
style
Removed internal annotations
Minor fixes
Create the db file if does not exist.
 shell task commit. Please check email, i've sent you the document which explains why i didn't make it before deadline
Delete PocketParser.java
Create BatchParser.java
Update CommandExecutor.java