included analog and digital fail test sensors
Merge remote-tracking branch 'upstream/master'

Conflicts:
	server/sensor.c
	server/sensor.h
Modified sanity check
Merge pull request #31 from Callum-/master

included analog and digital fail test sensors