merge
Merge branch 'master' of https://github.com/Echie/TietokannatHT

Conflicts:
	vk2.db
Merge branch 'master' of https://github.com/Echie/TietokannatHT
merge
Merge branch 'master' of https://github.com/Echie/TietokannatHT
house add works