Merge branch 'ashley'

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

Conflicts:
	GannetLoad.m