Klient

Zmiany w kliencie.
Merge branch 'master' of https://github.com/aliquide/turboZPR

Conflicts:
	model/Main.cpp
	model/Mockup.h