i will test what will happened if i change online file while the local file. #this one is changed in local
Merge branch 'master' of github.com:OleNet/labalgo

Conflicts:
	CalcRoc.m