Fixed error that erika found.

Commented lines 187-192 in melanopsin.m
Merge branch 'master' of https://github.com/Melanopsin/MelanoposinCode

Conflicts:
	Set_IC_ephys.m