ok
proper
v1.0
Merge branch 'master' of github.com:AndrewTimokhin/fizteh-java-2014

Conflicts:
	src/ru/fizteh/fivt/students/AndrewTimokhin/DataBase/Reader.java
v1.0