Unmergeabe mess

Conflicts:
	GannetCoRegister.m
	GannetCoRegister.m~
	GannetMask_GE.m
tilde
Merge branch 'master' of https://github.com/cjohnevans/Gannet2.0

Conflicts:
	GannetCoRegister.m
	GannetCoRegister.m~
	GannetMask_GE.m