osetreni chyby u malloc
Merge remote-tracking branch 'origin/master'

Conflicts:
	GMU-Projekt/src/main.cpp