satisfying dmitriy
Merge remote-tracking branch 'origin/master' into calc

Conflicts:
	src/ru/fizteh/fivt/students/dsalnikov/filemap/SingleFileTable.java
	src/ru/fizteh/fivt/students/dsalnikov/multifilemap/MultiFileHashMap.java
	src/ru/fizteh/fivt/students/dsalnikov/multifilemap/commands/CreateCommand.java
	src/ru/fizteh/fivt/students/dsalnikov/multifilemap/commands/UseCommand.java