Upravy
Upravy
Merge branch 'master' of https://github.com/Honzys/IZP

Conflicts:
	project1/makefile
	project1/proj1
	project1/proj1.c
	project1/tabulka.txt