Files of Machiel and Christan -MAR
magnetometry files, added pulses to pulselib, magnet optimizer update - Cristian
Merge branch 'master' of https://github.com/teamdiamond/measurement

Conflicts:
	ADwin_Codes/adwin_pro_2_lt2/adaptive_magnetometry_lt2.bas

resolved conflict - Cristian