.
Merge branch 'master' of https://github.com/DoganA/Belegsystem

Conflicts:
	Belegsystem.layout
	TBlock.cpp
	TBlock.h
	TRoom.cpp