3780 cut3
Merge branch 'master' of https://github.com/ainikolaev2013/Master-s

Conflicts:
	EVM_Matlab/exp2_av.m