Try to commit past version of JUnit
Merge branch 'restructuring_repo'

Conflicts:
	src/ru/fizteh/fivt/students/dmitry_persiyanov/database/db_manager/DbManager.java
fixed
Merge branch 'master' of https://github.com/drack3800/fizteh-java-2014

Conflicts:
	src/ru/fizteh/fivt/students/dmitry_persiyanov/database/db_manager/DbManager.java