rewerwfsd :P
Merge branch 'master' of https://github.com/lastverb/omletkurs

Conflicts:
	simulations/omnetpp.ini
	src/Makefile
fq i poprawa wrr
Merge branch 'master' of https://github.com/lastverb/omletkurs

Conflicts:
	simulations/omnetpp.ini
	src/Makefile
	src/package.ned