Bajs
Merge branch 'master' of https://github.com/Gurey/DataBaseMiniUtv

Conflicts:
	bin/.gitignore
	src/database/QueryCaller.java