Merge branch 'FileMap' into MultyFileMap
Merge conflict deleted
Merge conflicted deleted
Merge conflicted deleted
Merge conflicted deleted
Merge conflicted deleted
Fixed
Merge branch 'JUnit' into MultyFileMap
Merged with 3rd task
Fixed
Merge branch 'MultyFileMap' into JUnit
Merge with 3rd
Merge with 3rd
Merge branch 'JUnit' into Storeable
Merge branch 'Storeable' into Parallel
Merge branch 'Parallel' into Proxy