Commit before merge
Merge branch 'master' of https://github.com/JimHokanson/matlab_NEURON

Conflicts:
	single_ap_tester.m
Merge branch 'master' of https://github.com/JimHokanson/matlab_NEURON