# Ümardamine
Merge branch 'master' of git@github.com:maikop/Kvaliteetsed-Ideed.git

Conflicts:
	data/POSdb.properties
	data/POSdb.script