MB
MB
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	ADwin_Codes/adwin_pro_2_lt2/adaptive_magnetometry_lt2.bas

bringing RT2 back up to date.
NK
Bringing RT2 up to date.

NK
Merge branch 'master' of https://github.com/teamdiamond/measurement