JUnit added
Merge pull request #1 from dkomanov/tasks

Tasks
Fixed merge conflict
Other tasks removed
Merge branch 'master' into JUnit
Merge branch 'JUnit' of https://github.com/pershik/fizteh-java-2014 into pershik-JUnit

Conflicts:
	src/ru/fizteh/fivt/students/pershik/MultiFileHashMap/Table.java