add code instruction Mjerge branch 'master' of wopr:/home/campus14/apklinkh/repo/protocon-pub
add code instruction
Mjerge branch 'master' of wopr:/home/campus14/apklinkh/repo/protocon-pub

Conflicts:
	doc/report/main.tex

grencez/protocon,grencez/protocon,grencez/protocon,grencez/protocon