Awaryjny commit
Merge branch 'master' of https://github.com/twardakm/Quadro-Marcin

Conflicts:
	quadro.cogui
	quadro.coproj