merge
Merge branch 'master' of https://github.com/scienceopen/led-timemeasure

Conflicts:
	RunFireReader.m
	firereader.m

merge