Fixed syntax bug in adwin. Next phase of testing
Adwin stuff MAR
Merge branch 'master' of https://github.com/teamdiamond/measurement