oprava stinu, cachovani, oprava velikosti obrazku
fix poctu el. na radek
bugy
Merge remote-tracking branch 'origin/pospa' into pospa

Conflicts:
	.gitignore
	.idea/workspace.xml