Konflikt
Merge branch 'master' of https://github.com/kuzawskak/14-pl-05

Conflicts:
	src/ComputationalCluster.v11.suo