reset
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ru/fizteh/fivt/students/ermolenko/storable/tests/StoreableTableTest.java