Mine
Merge branch 'master' of https://github.com/Melanopsin/MelanoposinCode

Conflicts:
	ephys.mat