Lab update 10.03
Merge branch 'master' of https://github.com/sangillee/ANALYSIS

Conflicts:
	Neuroec/controlleddata.mat
	Neuroec/neuroecanalyze.m