patar patarebi
Merge branch 'master' of https://github.com/slezh12/Paputka

Conflicts:
	src/JavaPackage/MyDBInfo.java