chuj
Merge branch 'master' of https://github.com/ACPLMaverick/marjan

Conflicts:
	Numerki/Zadanie01/Zadanie01.v12.suo