Merge branch 'master' of https://github.com/cjohnevans/Gannet2.0

Conflicts:
	GannetFit.m
test

test